[svn-commits] qwell: branch 1.6.1 r180947 - in /branches/1.6.1: ./ autoconf/

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Mar 10 17:07:18 2009
New Revision: 180947

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180947
Log:
Merged revisions 180944 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r180944 | qwell | 2009-03-10 17:03:41 -0500 (Tue, 10 Mar 2009) | 9 lines
  
  Merged revisions 180941 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r180941 | qwell | 2009-03-10 17:02:18 -0500 (Tue, 10 Mar 2009) | 1 line
    
    Make things happier when using autoconf 2.62+
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/autoconf/ast_check_gnu_make.m4
    branches/1.6.1/autoconf/ast_prog_sed.m4
    branches/1.6.1/configure
    branches/1.6.1/configure.ac

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/autoconf/ast_check_gnu_make.m4
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/autoconf/ast_check_gnu_make.m4?view=diff&rev=180947&r1=180946&r2=180947
==============================================================================
--- branches/1.6.1/autoconf/ast_check_gnu_make.m4 (original)
+++ branches/1.6.1/autoconf/ast_check_gnu_make.m4 Tue Mar 10 17:07:18 2009
@@ -1,20 +1,20 @@
-AC_DEFUN([AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK(for GNU make, GNU_MAKE,
-   GNU_MAKE='Not Found' ;
-   GNU_MAKE_VERSION_MAJOR=0 ;
-   GNU_MAKE_VERSION_MINOR=0 ;
+AC_DEFUN([AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK([for GNU make], [ac_cv_GNU_MAKE],
+   ac_cv_GNU_MAKE='Not Found' ;
+   ac_cv_GNU_MAKE_VERSION_MAJOR=0 ;
+   ac_cv_GNU_MAKE_VERSION_MINOR=0 ;
    for a in make gmake gnumake ; do
       if test -z "$a" ; then continue ; fi ;
       if ( sh -c "$a --version" 2> /dev/null | grep GNU  2>&1 > /dev/null ) ;  then
-         GNU_MAKE=$a ;
-         GNU_MAKE_VERSION_MAJOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f3 -d' ' | cut -f1 -d'.'`
-         GNU_MAKE_VERSION_MINOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f2 -d'.' | cut -c1-2`
+         ac_cv_GNU_MAKE=$a ;
+         ac_cv_GNU_MAKE_VERSION_MAJOR=`$ac_cv_GNU_MAKE --version | grep "GNU Make" | cut -f3 -d' ' | cut -f1 -d'.'`
+         ac_cv_GNU_MAKE_VERSION_MINOR=`$ac_cv_GNU_MAKE --version | grep "GNU Make" | cut -f2 -d'.' | cut -c1-2`
          break;
       fi
    done ;
 ) ;
-if test  "x$GNU_MAKE" = "xNot Found"  ; then
+if test  "x$ac_cv_GNU_MAKE" = "xNot Found"  ; then
    AC_MSG_ERROR( *** Please install GNU make.  It is required to build Asterisk!)
    exit 1
 fi
-AC_SUBST([GNU_MAKE])
+AC_SUBST([GNU_MAKE], [$ac_cv_GNU_MAKE])
 ])

Modified: branches/1.6.1/autoconf/ast_prog_sed.m4
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/autoconf/ast_prog_sed.m4?view=diff&rev=180947&r1=180946&r2=180947
==============================================================================
--- branches/1.6.1/autoconf/ast_prog_sed.m4 (original)
+++ branches/1.6.1/autoconf/ast_prog_sed.m4 Tue Mar 10 17:07:18 2009
@@ -12,8 +12,7 @@
      done
      echo "$ac_script" | sed 99q >conftest.sed
      $as_unset ac_script || ac_script=
-     ifdef([_AC_PATH_PROGS_FEATURE_CHECK],[],[define([_AC_PATH_PROGS_FEATURE_CHECK],defn([_AC_PATH_PROG_FEATURE_CHECK]))])
-     _AC_PATH_PROGS_FEATURE_CHECK(SED, [sed gsed],
+     ifdef([_AC_PATH_PROGS_FEATURE_CHECK], [_AC_PATH_PROGS_FEATURE_CHECK], [_AC_PATH_PROG_FEATURE_CHECK])(SED, [sed gsed],
 	[_AC_FEATURE_CHECK_LENGTH([ac_path_SED], [ac_cv_path_SED],
 		["$ac_path_SED" -f conftest.sed])])])
  SED="$ac_cv_path_SED"

Modified: branches/1.6.1/configure.ac
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/configure.ac?view=diff&rev=180947&r1=180946&r2=180947
==============================================================================
--- branches/1.6.1/configure.ac (original)
+++ branches/1.6.1/configure.ac Tue Mar 10 17:07:18 2009
@@ -23,7 +23,6 @@
 AC_COPYRIGHT("Asterisk")
 AC_REVISION($Revision$)
 
-AC_GNU_SOURCE
 AC_USE_SYSTEM_EXTENSIONS	# note- does not work on FreeBSD
 
 case "${host_os}" in