[svn-commits] kpfleming: tools/trunk r6512 - in /tools/trunk: acinclude.m4 configure

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Mon Apr 27 14:45:30 2009
New Revision: 6512

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6512
Log:
incorporate the autoconf 2.63 fixes here too


Modified:
    tools/trunk/acinclude.m4
    tools/trunk/configure   (contents, props changed)

Modified: tools/trunk/acinclude.m4
URL: http://svn.digium.com/svn-view/dahdi/tools/trunk/acinclude.m4?view=diff&rev=6512&r1=6511&r2=6512
==============================================================================
--- tools/trunk/acinclude.m4 (original)
+++ tools/trunk/acinclude.m4 Mon Apr 27 14:45:30 2009
@@ -257,28 +257,26 @@
     fi
 ])
 
-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])
+])
 
 AC_DEFUN(
 [AST_CHECK_PWLIB], [

Propchange: tools/trunk/configure
            ('svn:eol-style' removed)

Propchange: tools/trunk/configure
            ('svn:keywords' removed)

Propchange: tools/trunk/configure
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Mon Apr 27 14:45:30 2009
@@ -1,1 +1,1 @@
-text/plain
+application/octet-stream