diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2009-04-27 19:45:30 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-04-27 19:45:30 +0000 |
| commit | a8fed829ef0fac114b19db4e29b985d3f1a7abfd (patch) | |
| tree | a9db37915393735d7f8b334f806be7051be3ea41 /acinclude.m4 | |
| parent | 50bba0fd6d29acf933a2e0327618958e8951a972 (diff) | |
incorporate the autoconf 2.63 fixes here too
git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@6512 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 1395241..587445e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -257,29 +257,27 @@ AC_DEFUN([AST_EXT_TOOL_CHECK], 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], [ PWLIB_INCDIR= |