[asterisk-commits] tilghman: branch 1.6.2 r290201 - in /branches/1.6.2: ./ configure configure.ac

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Oct  4 15:22:03 2010
New Revision: 290201

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=290201
Log:
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:
    branches/1.6.2/   (props changed)
    branches/1.6.2/configure
    branches/1.6.2/configure.ac

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configure.ac?view=diff&rev=290201&r1=290200&r2=290201
==============================================================================
--- branches/1.6.2/configure.ac (original)
+++ branches/1.6.2/configure.ac Mon Oct  4 15:22:03 2010
@@ -1876,9 +1876,9 @@
 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 @@
 
 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