[asterisk-commits] branch group/autoconf_and_menuselect r21742 - /team/group/autoconf_and_menuse...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Apr 20 12:25:01 2006
New Revision: 21742

URL: http://svn.digium.com/view/asterisk?rev=21742&view=rev
Log:
- add a macro to check for GNU make
- set the MAKE variable to be the command that was found that runs GNU make

Modified:
    team/group/autoconf_and_menuselect/acinclude.m4
    team/group/autoconf_and_menuselect/configure.ac
    team/group/autoconf_and_menuselect/makeopts.in

Modified: team/group/autoconf_and_menuselect/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/acinclude.m4?rev=21742&r1=21741&r2=21742&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/acinclude.m4 (original)
+++ team/group/autoconf_and_menuselect/acinclude.m4 Thu Apr 20 12:25:01 2006
@@ -101,3 +101,22 @@
 AC_SUBST([$1_INCLUDE])
 AC_SUBST([PBX_LIB$1])
 ])
+
+AC_DEFUN(
+        [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
+                GNU_MAKE='Not Found' ;
+                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 ;
+                                break;
+                        fi
+                done ;
+		AC_MSG_RESULT($GNU_MAKE);
+        ) ;
+        if test  "x$GNU_MAKE" = "xNot Found"  ; then
+		echo " *** Please install GNU make.  It is required to build Asterisk!"
+		exit 1
+        fi
+	AC_SUBST([GNU_MAKE])
+] )

Modified: team/group/autoconf_and_menuselect/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/configure.ac?rev=21742&r1=21741&r2=21742&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/configure.ac (original)
+++ team/group/autoconf_and_menuselect/configure.ac Thu Apr 20 12:25:01 2006
@@ -134,6 +134,7 @@
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_RANLIB
+CHECK_GNU_MAKE
 
 AC_PATH_PROG([GREP], [grep], :)
 AC_PATH_PROG([AR], [ar], :)

Modified: team/group/autoconf_and_menuselect/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/makeopts.in?rev=21742&r1=21741&r2=21742&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/makeopts.in (original)
+++ team/group/autoconf_and_menuselect/makeopts.in Thu Apr 20 12:25:01 2006
@@ -2,6 +2,7 @@
 HOST_CC=@CC@
 CXX=@CXX@
 
+MAKE=@GNU_MAKE@
 INSTALL=@INSTALL@
 GREP=@GREP@
 AR=@AR@