diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-04 20:22:03 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-04 20:22:03 +0000 |
| commit | 97f5d333487f00f45efaddd3040877e4f186d9c4 (patch) | |
| tree | 088fd0b67b2d49ec3a3568932aadcc869d00d947 | |
| parent | 1f4ca6685d4a5318cdf77a3d7b37cef3b384c3ca (diff) | |
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/branches/1.6.2@290201 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: 288637 . +# From configure.ac Revision: 290101 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6.2. # @@ -44914,9 +44914,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" @@ -46593,14 +46593,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 53953068e..c2a913337 100644 --- a/configure.ac +++ b/configure.ac @@ -1876,9 +1876,9 @@ AC_SUBST([GENERIC_ODBC_INCLUDE]) AC_SUBST([PBX_GENERIC_ODBC]) 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]) @@ -1896,14 +1896,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 |