Merged revisions 242966 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 25 Jan 2010 21:38:33 +0000 (21:38 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 25 Jan 2010 21:38:33 +0000 (21:38 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r242966 | tilghman | 2010-01-25 15:36:33 -0600 (Mon, 25 Jan 2010) | 2 lines

  Only rebuild parsers by an option in menuselect
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@242967 65c4cc65-6c06-0410-ace0-fbb531ad65f3

build_tools/cflags.xml
build_tools/menuselect-deps.in
configure
configure.ac

index d0498a4..189820d 100644 (file)
                </member>
                <member name="DEBUG_FD_LEAKS" displayname="Enable File Descriptor Leak Detection">
                </member>
+               <member name="REBUILD_PARSERS" displayname="Rebuild AEL and expression parsers from bison/flex source files">
+                       <depend>bison</depend>
+                       <depend>flex</depend>
+                       <defaultenabled>no</defaultenabled>
+               </member>
                <member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
                </member>
                <member name="USE_HOARD_ALLOCATOR" displayname="Use the Hoard Memory Allocator instead of the default system one">
index d0d8655..6a33830 100644 (file)
@@ -1,8 +1,10 @@
 ALSA=@PBX_ALSA@
 BLUETOOTH=@PBX_BLUETOOTH@
 CRYPTO=@PBX_CRYPTO@
+BISON=@PBX_BISON@
 CURL=@PBX_CURL@
 DAHDI=@PBX_DAHDI@
+FLEX=@PBX_FLEX@
 FREETDS=@PBX_FREETDS@
 GENERIC_ODBC=@PBX_GENERIC_ODBC@
 GMIME=@PBX_GMIME@
index 6d30e2b..ec9ac0c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 242521 .
+# From configure.ac Revision: 242857 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -720,6 +720,8 @@ KPATHSEA
 XMLSTARLET
 FETCH
 DOWNLOAD
+PBX_BISON
+PBX_FLEX
 SOXMIX
 MD5
 acx_pthread_config
@@ -7701,8 +7703,18 @@ fi
 echo "${ECHO_T}$ac_cv_path_BISON2" >&6; }
 if test "x${ac_cv_path_BISON2}" = "x" ; then
        BISON=:
+       PBX_BISON=0
+else
+       PBX_BISON=1
 fi
 
+if test "x${FLEX}" = "x:" ; then
+       PBX_FLEX=0
+else
+       PBX_FLEX=1
+fi
+
+
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}soxmix", so it can be a program name with args.
 set dummy ${ac_tool_prefix}soxmix; ac_word=$2
@@ -47503,6 +47515,8 @@ KPATHSEA!$KPATHSEA$ac_delim
 XMLSTARLET!$XMLSTARLET$ac_delim
 FETCH!$FETCH$ac_delim
 DOWNLOAD!$DOWNLOAD$ac_delim
+PBX_BISON!$PBX_BISON$ac_delim
+PBX_FLEX!$PBX_FLEX$ac_delim
 SOXMIX!$SOXMIX$ac_delim
 MD5!$MD5$ac_delim
 acx_pthread_config!$acx_pthread_config$ac_delim
@@ -47594,8 +47608,6 @@ PBX_IODBC!$PBX_IODBC$ac_delim
 ISDNNET_LIB!$ISDNNET_LIB$ac_delim
 ISDNNET_INCLUDE!$ISDNNET_INCLUDE$ac_delim
 ISDNNET_DIR!$ISDNNET_DIR$ac_delim
-PBX_ISDNNET!$PBX_ISDNNET$ac_delim
-JACK_LIB!$JACK_LIB$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -47637,6 +47649,8 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+PBX_ISDNNET!$PBX_ISDNNET$ac_delim
+JACK_LIB!$JACK_LIB$ac_delim
 JACK_INCLUDE!$JACK_INCLUDE$ac_delim
 JACK_DIR!$JACK_DIR$ac_delim
 PBX_JACK!$PBX_JACK$ac_delim
@@ -47732,8 +47746,6 @@ PRI_VERSION_LIB!$PRI_VERSION_LIB$ac_delim
 PRI_VERSION_INCLUDE!$PRI_VERSION_INCLUDE$ac_delim
 PRI_VERSION_DIR!$PRI_VERSION_DIR$ac_delim
 PBX_PRI_VERSION!$PBX_PRI_VERSION$ac_delim
-PRI_INBANDDISCONNECT_LIB!$PRI_INBANDDISCONNECT_LIB$ac_delim
-PRI_INBANDDISCONNECT_INCLUDE!$PRI_INBANDDISCONNECT_INCLUDE$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -47775,6 +47787,8 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+PRI_INBANDDISCONNECT_LIB!$PRI_INBANDDISCONNECT_LIB$ac_delim
+PRI_INBANDDISCONNECT_INCLUDE!$PRI_INBANDDISCONNECT_INCLUDE$ac_delim
 PRI_INBANDDISCONNECT_DIR!$PRI_INBANDDISCONNECT_DIR$ac_delim
 PBX_PRI_INBANDDISCONNECT!$PBX_PRI_INBANDDISCONNECT$ac_delim
 PRI_PROG_W_CAUSE_LIB!$PRI_PROG_W_CAUSE_LIB$ac_delim
@@ -47870,8 +47884,6 @@ TINFO_INCLUDE!$TINFO_INCLUDE$ac_delim
 TINFO_DIR!$TINFO_DIR$ac_delim
 PBX_TINFO!$PBX_TINFO$ac_delim
 TONEZONE_LIB!$TONEZONE_LIB$ac_delim
-TONEZONE_INCLUDE!$TONEZONE_INCLUDE$ac_delim
-TONEZONE_DIR!$TONEZONE_DIR$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -47913,6 +47925,8 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+TONEZONE_INCLUDE!$TONEZONE_INCLUDE$ac_delim
+TONEZONE_DIR!$TONEZONE_DIR$ac_delim
 PBX_TONEZONE!$PBX_TONEZONE$ac_delim
 UNIXODBC_LIB!$UNIXODBC_LIB$ac_delim
 UNIXODBC_INCLUDE!$UNIXODBC_INCLUDE$ac_delim
@@ -48008,7 +48022,7 @@ PBX_SYSLOG!$PBX_SYSLOG$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
index 2bd29f8..ea0e3eb 100644 (file)
@@ -241,7 +241,17 @@ __EOL__
        ])
 if test "x${ac_cv_path_BISON2}" = "x" ; then
        BISON=:
+       PBX_BISON=0
+else
+       PBX_BISON=1
+fi
+AC_SUBST(PBX_BISON)
+if test "x${FLEX}" = "x:" ; then
+       PBX_FLEX=0
+else
+       PBX_FLEX=1
 fi
+AC_SUBST(PBX_FLEX)
 
 AC_CHECK_TOOL([SOXMIX], [soxmix], [:])
 if test "${SOXMIX}" != ":" ; then