diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-04 20:15:26 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-04 20:15:26 +0000 |
| commit | 4b2d203bfe1f13ce76112db27809221a73d1bfd1 (patch) | |
| tree | 11a7434fb2cc0989eb68447fdf4ae3f3b9e8fcb7 | |
| parent | 7d92d069ff2dcc3bc457c8aebf8d4a97d74a3d65 (diff) | |
Fixing Mac OS X auto-builder.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@290177 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 15 insertions, 15 deletions
@@ -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 diff --git a/configure.ac b/configure.ac index e8f33b3e2..755631e7f 100644 --- a/configure.ac +++ b/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 |