diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-03 21:08:45 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-03 21:08:45 +0000 |
| commit | e79e599a24fff6127bf90f28b2f70e59134e47e3 (patch) | |
| tree | b49b5625bd19ec089de8ac7fbc6ac10de7b08c20 /configure.ac | |
| parent | f9c6940eeb6b7b7e18a77f1555d77a1ffbca2f09 (diff) | |
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/branches/1.8@290102 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index b0bcd976c..135ccb640 100644 --- a/configure.ac +++ b/configure.ac @@ -217,6 +217,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], :) @@ -230,6 +231,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], :) @@ -2149,6 +2151,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 @@ -2164,6 +2172,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 " .\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$=.. " |