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

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sun Oct  3 16:09:52 2010
New Revision: 290103

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

................
  r290102 | tilghman | 2010-10-03 16:08:45 -0500 (Sun, 03 Oct 2010) | 16 lines
  
  Merged revisions 290101 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r290101 | tilghman | 2010-10-03 16:06:58 -0500 (Sun, 03 Oct 2010) | 9 lines
    
    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:
    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=290103&r1=290102&r2=290103
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sun Oct  3 16:09:52 2010
@@ -220,6 +220,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], :)
@@ -233,6 +234,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], :)
@@ -2152,6 +2154,12 @@
 
 AC_SUBST([PBX_SYSLOG])
 
+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
 
@@ -2166,6 +2174,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