diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-10 22:07:18 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-10 22:07:18 +0000 |
commit | dd861bddb14c0b35fb11cb42449b9f5a421bc07e (patch) | |
tree | 75d70ebb2a3b67b082fa181df200cca521749d10 /configure | |
parent | 04c4577103e752813a4e90cfc9f15266277c9b71 (diff) |
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+
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@180947 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 164266 . +# From configure.ac Revision: 177164 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -6141,7 +6141,6 @@ else done echo "$ac_script" | sed 99q >conftest.sed $as_unset ac_script || ac_script= - # Extract the first word of "sed gsed" to use in msg output if test -z "$SED"; then set dummy sed gsed; ac_prog_name=$2 @@ -6568,31 +6567,32 @@ fi { echo "$as_me:$LINENO: checking for GNU make" >&5 echo $ECHO_N "checking for GNU make... $ECHO_C" >&6; } -if test "${GNU_MAKE+set}" = set; then +if test "${ac_cv_GNU_MAKE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - GNU_MAKE='Not Found' ; - GNU_MAKE_VERSION_MAJOR=0 ; - GNU_MAKE_VERSION_MINOR=0 ; + 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 ; fi -{ echo "$as_me:$LINENO: result: $GNU_MAKE" >&5 -echo "${ECHO_T}$GNU_MAKE" >&6; } ; -if test "x$GNU_MAKE" = "xNot Found" ; then +{ echo "$as_me:$LINENO: result: $ac_cv_GNU_MAKE" >&5 +echo "${ECHO_T}$ac_cv_GNU_MAKE" >&6; } ; +if test "x$ac_cv_GNU_MAKE" = "xNot Found" ; then { { echo "$as_me:$LINENO: error: *** Please install GNU make. It is required to build Asterisk!" >&5 echo "$as_me: error: *** Please install GNU make. It is required to build Asterisk!" >&2;} { (exit 1); exit 1; }; } exit 1 fi +GNU_MAKE=$ac_cv_GNU_MAKE |