[svn-commits] tilghman: trunk r290218 - in /trunk: ./ configure configure.ac

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Oct  4 15:24:41 2010
New Revision: 290218

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=290218
Log:
Merged revisions 290209 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r290209 | tilghman | 2010-10-04 15:23:13 -0500 (Mon, 04 Oct 2010) | 16 lines
  
  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.
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=290218&r1=290217&r2=290218
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Oct  4 15:24:41 2010
@@ -2155,9 +2155,9 @@
 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 @@
 
 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