[svn-commits] tilghman: branch 1.4 r290100 - in /branches/1.4: configure configure.ac

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sun Oct  3 16:04:29 2010
New Revision: 290100

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=290100
Log:
Automatically re-run configure test for menuselect, when the relevant makeopts settings change.

Modified:
    branches/1.4/configure
    branches/1.4/configure.ac

Modified: branches/1.4/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/configure.ac?view=diff&rev=290100&r1=290099&r2=290100
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Sun Oct  3 16:04:29 2010
@@ -135,6 +135,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], :)
@@ -147,6 +148,7 @@
 
 AC_PATH_PROG([AWK], [awk], :)
 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], :)
@@ -1837,8 +1839,24 @@
 AC_SUBST(GTK2_INCLUDE)
 AC_SUBST(GTK2_LIB)
 
+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])
 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