[svn-commits] tilghman: branch 1.6.2 r290101 - in /branches/1.6.2: ./ configure configure.ac

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sun Oct  3 16:06:58 2010
New Revision: 290101

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

........
  r290100 | tilghman | 2010-10-03 16:04:29 -0500 (Sun, 03 Oct 2010) | 2 lines
  
  Automatically re-run configure test for menuselect, when the relevant makeopts settings change.
........

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=290101&r1=290100&r2=290101
==============================================================================
--- branches/1.6.2/configure.ac (original)
+++ branches/1.6.2/configure.ac Sun Oct  3 16:06:58 2010
@@ -176,6 +176,7 @@
 AC_PROG_LN_S
 AC_PROG_RANLIB
 AST_CHECK_GNU_MAKE
+AC_PROG_EGREP
 
 AC_CHECK_TOOLS([STRIP], [strip gstrip], :)
 AC_CHECK_TOOLS([AR], [ar gar], :)
@@ -188,6 +189,7 @@
 AC_SUBST(GNU_LD)
 
 AC_PATH_PROG([BISON], [bison], :)
+AC_PATH_PROG([CMP], [cmp], :)
 AC_PATH_PROG([FLEX], [flex], :)
 AC_PATH_PROG([GREP], [grep], :)
 AC_PATH_PROG([FIND], [find], :)
@@ -1873,6 +1875,12 @@
 AC_SUBST([GENERIC_ODBC_INCLUDE])
 AC_SUBST([PBX_GENERIC_ODBC])
 
+if test -f makeopts; then
+	${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.bak
+else
+	touch makeopts.bak
+fi
+
 AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])
 AST_CHECK_MANDATORY
 
@@ -1887,6 +1895,16 @@
 fi
 
 AC_OUTPUT
+
+${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.bak2
+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 )
+fi ; fi
+
+rm makeopts.bak makeopts.bak2
+
 
 if test "x${silent}" != "xyes" ; then
 echo