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
This commit is contained in:
parent
4b9a0c8aed
commit
1322112da0
|
@ -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])
|
||||
])
|
||||
|
|
|
@ -12,8 +12,7 @@ AC_DEFUN([AST_PROG_SED],
|
|||
done
|
||||
echo "$ac_script" | sed 99q >conftest.sed
|
||||
$as_unset ac_script || ac_script=
|
||||
ifdef([_AC_PATH_PROGS_FEATURE_CHECK],[],[define([_AC_PATH_PROGS_FEATURE_CHECK],defn([_AC_PATH_PROG_FEATURE_CHECK]))])
|
||||
_AC_PATH_PROGS_FEATURE_CHECK(SED, [sed gsed],
|
||||
ifdef([_AC_PATH_PROGS_FEATURE_CHECK], [_AC_PATH_PROGS_FEATURE_CHECK], [_AC_PATH_PROG_FEATURE_CHECK])(SED, [sed gsed],
|
||||
[_AC_FEATURE_CHECK_LENGTH([ac_path_SED], [ac_cv_path_SED],
|
||||
["$ac_path_SED" -f conftest.sed])])])
|
||||
SED="$ac_cv_path_SED"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.ac Revision: 177162 .
|
||||
# From configure.ac Revision: 178605 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
|
||||
#
|
||||
|
@ -6181,7 +6181,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
|
||||
|
@ -6608,31 +6607,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
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -23,7 +23,6 @@ AC_CONFIG_HEADER(include/asterisk/autoconfig.h)
|
|||
AC_COPYRIGHT("Asterisk")
|
||||
AC_REVISION($Revision$)
|
||||
|
||||
AC_GNU_SOURCE
|
||||
AC_USE_SYSTEM_EXTENSIONS # note- does not work on FreeBSD
|
||||
|
||||
case "${host_os}" in
|
||||
|
|
Loading…
Reference in New Issue