Merged revisions 290209 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r290209 | tilghman | 2010-10-04 15:23:13 -0500 (Mon, 04 Oct 2010) | 16 lines Merged revisions 290201 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r290201 | tilghman | 2010-10-04 15:22:03 -0500 (Mon, 04 Oct 2010) | 9 lines Merged revisions 290177 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r290177 | tilghman | 2010-10-04 15:15:26 -0500 (Mon, 04 Oct 2010) | 2 lines Fixing Mac OS X auto-builder. ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@290218 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
6ed5914116
commit
a8de980818
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.ac Revision: 289112 .
|
||||
# From configure.ac Revision: 290103 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for asterisk trunk.
|
||||
#
|
||||
|
@ -53824,9 +53824,9 @@ fi
|
|||
|
||||
|
||||
if test -f makeopts; then
|
||||
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.bak
|
||||
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak
|
||||
else
|
||||
touch makeopts.bak
|
||||
touch makeopts.acbak
|
||||
fi
|
||||
|
||||
ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts channels/h323/Makefile"
|
||||
|
@ -55662,14 +55662,14 @@ if test "$no_create" != yes; then
|
|||
fi
|
||||
|
||||
|
||||
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.bak2
|
||||
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
|
||||
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 )
|
||||
( cd `pwd`/menuselect && ./configure )
|
||||
else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else
|
||||
( cd `pwd`/menuselect && ./configure )
|
||||
fi ; fi
|
||||
|
||||
rm makeopts.bak makeopts.bak2
|
||||
rm makeopts.acbak makeopts.acbak2
|
||||
|
||||
|
||||
if test "x${silent}" != "xyes" ; then
|
||||
|
|
14
configure.ac
14
configure.ac
|
@ -2155,9 +2155,9 @@ fi
|
|||
AC_SUBST([PBX_SYSLOG])
|
||||
|
||||
if test -f makeopts; then
|
||||
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.bak
|
||||
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak
|
||||
else
|
||||
touch makeopts.bak
|
||||
touch makeopts.acbak
|
||||
fi
|
||||
|
||||
AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])
|
||||
|
@ -2175,14 +2175,14 @@ fi
|
|||
|
||||
AC_OUTPUT
|
||||
|
||||
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.bak2
|
||||
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
|
||||
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 )
|
||||
( cd `pwd`/menuselect && ./configure )
|
||||
else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else
|
||||
( cd `pwd`/menuselect && ./configure )
|
||||
fi ; fi
|
||||
|
||||
rm makeopts.bak makeopts.bak2
|
||||
rm makeopts.acbak makeopts.acbak2
|
||||
|
||||
|
||||
if test "x${silent}" != "xyes" ; then
|
||||
|
|
Reference in New Issue