mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-08 02:48:29 +00:00
Fixing Mac OS X auto-builder.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@290177 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
16
configure
vendored
16
configure
vendored
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.ac Revision: 285889 .
|
||||
# From configure.ac Revision: 290100 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for asterisk 1.4.
|
||||
#
|
||||
@@ -34849,9 +34849,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"
|
||||
@@ -36355,14 +36355,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
@@ -1840,22 +1840,22 @@ AC_SUBST(GTK2_INCLUDE)
|
||||
AC_SUBST(GTK2_LIB)
|
||||
|
||||
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])
|
||||
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
Block a user