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/branches/1.8@290209 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 8 insertions, 8 deletions

diff --git a/configure b/configure
index deaf41ee0..85a9a5565 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 289104 .
+# From configure.ac Revision: 290102 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk trunk.
 #
@@ -53821,9 +53821,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"
@@ -55659,14 +55659,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