aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-03 21:09:52 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-03 21:09:52 +0000
commit6ed5914116e401472e473fdb943d11bba184c381 (patch)
treed6b0358cdf776bca866110b13346141d1be96321 /configure.ac
parentb43b18b708342b22827cf6d860cdc1a02250062e (diff)
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. ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@290103 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac18
1 files changed, 18 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 341ae3646..f4baeae49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,6 +220,7 @@ AC_PROG_INSTALL
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 @@ fi
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 @@ fi
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
@@ -2167,6 +2175,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
echo " .\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$=.. "