diff options
-rw-r--r-- | build_tools/cflags.xml | 5 | ||||
-rw-r--r-- | build_tools/menuselect-deps.in | 2 | ||||
-rwxr-xr-x | configure | 30 | ||||
-rw-r--r-- | configure.ac | 10 |
4 files changed, 39 insertions, 8 deletions
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml index 21f316fbf..97d51e613 100644 --- a/build_tools/cflags.xml +++ b/build_tools/cflags.xml @@ -7,6 +7,11 @@ </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="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations"> diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 7442b0485..cb0bd9f72 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -1,7 +1,9 @@ ASOUND=@PBX_ALSA@ +BISON=@PBX_BISON@ CURL=@PBX_CURL@ DAHDI=@PBX_DAHDI@ DAHDI_TRANSCODE=@PBX_DAHDI_TRANSCODE@ +FLEX=@PBX_FLEX@ FREETDS=@PBX_FREETDS@ GSM=@PBX_GSM@ GTK=@PBX_GTK@ @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 242520 . +# From configure.ac Revision: 242852 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.4. # @@ -713,6 +713,8 @@ DOT WGET FETCH DOWNLOAD +PBX_BISON +PBX_FLEX SOXMIX acx_pthread_config PTHREAD_CC @@ -7343,8 +7345,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 @@ -33298,9 +33310,9 @@ DOT!$DOT$ac_delim WGET!$WGET$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 -acx_pthread_config!$acx_pthread_config$ac_delim -PTHREAD_CC!$PTHREAD_CC$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -33342,6 +33354,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +acx_pthread_config!$acx_pthread_config$ac_delim +PTHREAD_CC!$PTHREAD_CC$ac_delim PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim AST_DEVMODE!$AST_DEVMODE$ac_delim @@ -33437,8 +33451,6 @@ PGSQL_LIB!$PGSQL_LIB$ac_delim PGSQL_INCLUDE!$PGSQL_INCLUDE$ac_delim PGSQL_DIR!$PGSQL_DIR$ac_delim PBX_PGSQL!$PBX_PGSQL$ac_delim -PRI_LIB!$PRI_LIB$ac_delim -PRI_INCLUDE!$PRI_INCLUDE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -33480,6 +33492,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PRI_LIB!$PRI_LIB$ac_delim +PRI_INCLUDE!$PRI_INCLUDE$ac_delim PRI_DIR!$PRI_DIR$ac_delim PBX_PRI!$PBX_PRI$ac_delim PRI_VERSION_LIB!$PRI_VERSION_LIB$ac_delim @@ -33575,8 +33589,6 @@ PBX_DAHDI_TRANSCODE!$PBX_DAHDI_TRANSCODE$ac_delim GSM_INTERNAL!$GSM_INTERNAL$ac_delim KDEINIT!$KDEINIT$ac_delim KDEDIR!$KDEDIR$ac_delim -NETSNMP_CONFIG!$NETSNMP_CONFIG$ac_delim -PG_CONFIG!$PG_CONFIG$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -33618,6 +33630,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +NETSNMP_CONFIG!$NETSNMP_CONFIG$ac_delim +PG_CONFIG!$PG_CONFIG$ac_delim PTLIB_CONFIG!$PTLIB_CONFIG$ac_delim PWLIBDIR!$PWLIBDIR$ac_delim PWLIB_INCDIR!$PWLIB_INCDIR$ac_delim @@ -33644,7 +33658,7 @@ _libcurl_config!$_libcurl_config$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 4a87657c6..60757bb4b 100644 --- a/configure.ac +++ b/configure.ac @@ -193,7 +193,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 |