From a00aa10f8cdfc1dab5bc4cca202755e88eee7035 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 4 Oct 2010 20:24:41 +0000
Subject: 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.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@290218 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 configure | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 6fd1823e8..6f501d612 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
-- 
cgit v1.2.3