diff --git a/configure b/configure index 6fd1823e8c2fde8bc450d20a7862ea3dee379ca8..6f501d61219ca5138c8062e4bff16f63b8c069ff 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.ac b/configure.ac index f4baeae49291086018de8eb0537e908af79459fd..76e05f31240b8c65436226af468f60c848b36264 100644 --- a/configure.ac +++ b/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