Merged revisions 290102 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r290102 | tilghman | 2010-10-03 16:08:45 -0500 (Sun, 03 Oct 2010) | 16 lines Merged revisions 290101 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r290101 | tilghman | 2010-10-03 16:06:58 -0500 (Sun, 03 Oct 2010) | 9 lines Merged revisions 290100 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r290100 | tilghman | 2010-10-03 16:04:29 -0500 (Sun, 03 Oct 2010) | 2 lines Automatically re-run configure test for menuselect, when the relevant makeopts settings change. ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@290103 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
parent
93f9937ede
commit
bb8fe71620
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.ac Revision: 288639 .
|
||||
# From configure.ac Revision: 289112 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for asterisk trunk.
|
||||
#
|
||||
|
|
@ -726,6 +726,7 @@ OPENSSL
|
|||
ac_ct_OPENSSL
|
||||
GNU_LD
|
||||
BISON
|
||||
CMP
|
||||
FLEX
|
||||
FIND
|
||||
COMPRESS
|
||||
|
|
@ -6886,6 +6887,89 @@ fi
|
|||
GNU_MAKE=$ac_cv_GNU_MAKE
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for egrep" >&5
|
||||
echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_path_EGREP+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
|
||||
then ac_cv_path_EGREP="$GREP -E"
|
||||
else
|
||||
# Extract the first word of "egrep" to use in msg output
|
||||
if test -z "$EGREP"; then
|
||||
set dummy egrep; ac_prog_name=$2
|
||||
if test "${ac_cv_path_EGREP+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_path_EGREP_found=false
|
||||
# Loop through the user's path and test for each of PROGNAME-LIST
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_prog in egrep; do
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
||||
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
||||
# Check for GNU ac_path_EGREP and select it if it is found.
|
||||
# Check for GNU $ac_path_EGREP
|
||||
case `"$ac_path_EGREP" --version 2>&1` in
|
||||
*GNU*)
|
||||
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
|
||||
*)
|
||||
ac_count=0
|
||||
echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
|
||||
while :
|
||||
do
|
||||
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
||||
mv "conftest.tmp" "conftest.in"
|
||||
cp "conftest.in" "conftest.nl"
|
||||
echo 'EGREP' >> "conftest.nl"
|
||||
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
||||
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
||||
ac_count=`expr $ac_count + 1`
|
||||
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
|
||||
# Best one so far, save it but keep looking for a better one
|
||||
ac_cv_path_EGREP="$ac_path_EGREP"
|
||||
ac_path_EGREP_max=$ac_count
|
||||
fi
|
||||
# 10*(2^10) chars as input seems more than enough
|
||||
test $ac_count -gt 10 && break
|
||||
done
|
||||
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
||||
esac
|
||||
|
||||
|
||||
$ac_path_EGREP_found && break 3
|
||||
done
|
||||
done
|
||||
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
|
||||
fi
|
||||
|
||||
EGREP="$ac_cv_path_EGREP"
|
||||
if test -z "$EGREP"; then
|
||||
{ { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
||||
echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
else
|
||||
ac_cv_path_EGREP=$EGREP
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
|
||||
echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
|
||||
EGREP="$ac_cv_path_EGREP"
|
||||
|
||||
|
||||
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
for ac_prog in strip gstrip
|
||||
|
|
@ -7351,6 +7435,47 @@ echo "${ECHO_T}no" >&6; }
|
|||
fi
|
||||
|
||||
|
||||
# Extract the first word of "cmp", so it can be a program name with args.
|
||||
set dummy cmp; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_path_CMP+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $CMP in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_CMP="$CMP" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
test -z "$ac_cv_path_CMP" && ac_cv_path_CMP=":"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
CMP=$ac_cv_path_CMP
|
||||
if test -n "$CMP"; then
|
||||
{ echo "$as_me:$LINENO: result: $CMP" >&5
|
||||
echo "${ECHO_T}$CMP" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
# Extract the first word of "flex", so it can be a program name with args.
|
||||
set dummy flex; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
|
|
@ -53698,6 +53823,12 @@ fi
|
|||
|
||||
|
||||
|
||||
if test -f makeopts; then
|
||||
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.bak
|
||||
else
|
||||
touch makeopts.bak
|
||||
fi
|
||||
|
||||
ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts channels/h323/Makefile"
|
||||
|
||||
|
||||
|
|
@ -54500,6 +54631,7 @@ OPENSSL!$OPENSSL$ac_delim
|
|||
ac_ct_OPENSSL!$ac_ct_OPENSSL$ac_delim
|
||||
GNU_LD!$GNU_LD$ac_delim
|
||||
BISON!$BISON$ac_delim
|
||||
CMP!$CMP$ac_delim
|
||||
FLEX!$FLEX$ac_delim
|
||||
FIND!$FIND$ac_delim
|
||||
COMPRESS!$COMPRESS$ac_delim
|
||||
|
|
@ -54589,7 +54721,6 @@ ICONV_DIR!$ICONV_DIR$ac_delim
|
|||
PBX_ICONV!$PBX_ICONV$ac_delim
|
||||
IKSEMEL_LIB!$IKSEMEL_LIB$ac_delim
|
||||
IKSEMEL_INCLUDE!$IKSEMEL_INCLUDE$ac_delim
|
||||
IKSEMEL_DIR!$IKSEMEL_DIR$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
|
|
@ -54631,6 +54762,7 @@ _ACEOF
|
|||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
IKSEMEL_DIR!$IKSEMEL_DIR$ac_delim
|
||||
PBX_IKSEMEL!$PBX_IKSEMEL$ac_delim
|
||||
IMAP_TK_LIB!$IMAP_TK_LIB$ac_delim
|
||||
IMAP_TK_INCLUDE!$IMAP_TK_INCLUDE$ac_delim
|
||||
|
|
@ -54727,7 +54859,6 @@ PBX_OSPTK!$PBX_OSPTK$ac_delim
|
|||
OSS_LIB!$OSS_LIB$ac_delim
|
||||
OSS_INCLUDE!$OSS_INCLUDE$ac_delim
|
||||
OSS_DIR!$OSS_DIR$ac_delim
|
||||
PBX_OSS!$PBX_OSS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
|
|
@ -54769,6 +54900,7 @@ _ACEOF
|
|||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
PBX_OSS!$PBX_OSS$ac_delim
|
||||
PGSQL_LIB!$PGSQL_LIB$ac_delim
|
||||
PGSQL_INCLUDE!$PGSQL_INCLUDE$ac_delim
|
||||
PGSQL_DIR!$PGSQL_DIR$ac_delim
|
||||
|
|
@ -54865,7 +54997,6 @@ SDL_IMAGE_LIB!$SDL_IMAGE_LIB$ac_delim
|
|||
SDL_IMAGE_INCLUDE!$SDL_IMAGE_INCLUDE$ac_delim
|
||||
SDL_IMAGE_DIR!$SDL_IMAGE_DIR$ac_delim
|
||||
PBX_SDL_IMAGE!$PBX_SDL_IMAGE$ac_delim
|
||||
SOUNDS_CACHE_DIR!$SOUNDS_CACHE_DIR$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
|
|
@ -54907,6 +55038,7 @@ _ACEOF
|
|||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
SOUNDS_CACHE_DIR!$SOUNDS_CACHE_DIR$ac_delim
|
||||
SPANDSP_LIB!$SPANDSP_LIB$ac_delim
|
||||
SPANDSP_INCLUDE!$SPANDSP_INCLUDE$ac_delim
|
||||
SPANDSP_DIR!$SPANDSP_DIR$ac_delim
|
||||
|
|
@ -55003,7 +55135,6 @@ PBX_WEAKREF!$PBX_WEAKREF$ac_delim
|
|||
GC_CFLAGS!$GC_CFLAGS$ac_delim
|
||||
GC_LDFLAGS!$GC_LDFLAGS$ac_delim
|
||||
AST_DECLARATION_AFTER_STATEMENT!$AST_DECLARATION_AFTER_STATEMENT$ac_delim
|
||||
AST_FORTIFY_SOURCE!$AST_FORTIFY_SOURCE$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
|
|
@ -55045,6 +55176,7 @@ _ACEOF
|
|||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
AST_FORTIFY_SOURCE!$AST_FORTIFY_SOURCE$ac_delim
|
||||
AST_NO_STRICT_OVERFLOW!$AST_NO_STRICT_OVERFLOW$ac_delim
|
||||
AST_SHADOW_WARNINGS!$AST_SHADOW_WARNINGS$ac_delim
|
||||
PBX_GLOB_NOMAGIC!$PBX_GLOB_NOMAGIC$ac_delim
|
||||
|
|
@ -55100,7 +55232,7 @@ PBX_SYSLOG!$PBX_SYSLOG$ac_delim
|
|||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
|
@ -55530,6 +55662,16 @@ if test "$no_create" != yes; then
|
|||
fi
|
||||
|
||||
|
||||
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.bak2
|
||||
if test "x${ac_cv_path_CMP}" = "x:"; then
|
||||
( cd menuselect && ./configure )
|
||||
else if ${ac_cv_path_CMP} -s makeopts.bak makeopts.bak2; then : ; else
|
||||
( cd menuselect && ./configure )
|
||||
fi ; fi
|
||||
|
||||
rm makeopts.bak makeopts.bak2
|
||||
|
||||
|
||||
if test "x${silent}" != "xyes" ; then
|
||||
echo
|
||||
echo " .\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$=.. "
|
||||
|
|
|
|||
18
configure.ac
18
configure.ac
|
|
@ -220,6 +220,7 @@ AC_PROG_INSTALL
|
|||
AC_PROG_LN_S
|
||||
AC_PROG_RANLIB
|
||||
AST_CHECK_GNU_MAKE
|
||||
AC_PROG_EGREP
|
||||
|
||||
AC_CHECK_TOOLS([STRIP], [strip gstrip], :)
|
||||
AC_CHECK_TOOLS([AR], [ar gar], :)
|
||||
|
|
@ -233,6 +234,7 @@ fi
|
|||
AC_SUBST(GNU_LD)
|
||||
|
||||
AC_PATH_PROG([BISON], [bison], :)
|
||||
AC_PATH_PROG([CMP], [cmp], :)
|
||||
AC_PATH_PROG([FLEX], [flex], :)
|
||||
AC_PATH_PROG([GREP], [grep], :)
|
||||
AC_PATH_PROG([FIND], [find], :)
|
||||
|
|
@ -2152,6 +2154,12 @@ fi
|
|||
|
||||
AC_SUBST([PBX_SYSLOG])
|
||||
|
||||
if test -f makeopts; then
|
||||
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.bak
|
||||
else
|
||||
touch makeopts.bak
|
||||
fi
|
||||
|
||||
AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])
|
||||
AST_CHECK_MANDATORY
|
||||
|
||||
|
|
@ -2167,6 +2175,16 @@ fi
|
|||
|
||||
AC_OUTPUT
|
||||
|
||||
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.bak2
|
||||
if test "x${ac_cv_path_CMP}" = "x:"; then
|
||||
( cd menuselect && ./configure )
|
||||
else if ${ac_cv_path_CMP} -s makeopts.bak makeopts.bak2; then : ; else
|
||||
( cd menuselect && ./configure )
|
||||
fi ; fi
|
||||
|
||||
rm makeopts.bak makeopts.bak2
|
||||
|
||||
|
||||
if test "x${silent}" != "xyes" ; then
|
||||
echo
|
||||
echo " .\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$=.. "
|
||||
|
|
|
|||
Loading…
Reference in New Issue