diff options
| author | Jason Parker <jparker@digium.com> | 2009-03-10 22:03:41 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2009-03-10 22:03:41 +0000 |
| commit | 1322112da003d709595982090a2823326ad139eb (patch) | |
| tree | ce76670c8302cb014eacbc019854cebeb950fe90 /autoconf/ast_check_gnu_make.m4 | |
| parent | 4b9a0c8aed81d3a675fdb921fa3bd4f7eff8c352 (diff) | |
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+
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@180944 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'autoconf/ast_check_gnu_make.m4')
| -rw-r--r-- | autoconf/ast_check_gnu_make.m4 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/autoconf/ast_check_gnu_make.m4 b/autoconf/ast_check_gnu_make.m4 index 454f1997f..5de603b28 100644 --- a/autoconf/ast_check_gnu_make.m4 +++ b/autoconf/ast_check_gnu_make.m4 @@ -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]) ]) |