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 | ||||
| -rw-r--r-- | main/Makefile | 4 | ||||
| -rw-r--r-- | res/Makefile | 4 |
6 files changed, 43 insertions, 12 deletions
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml index 4567360d4..c4d738b0d 100644 --- a/build_tools/cflags.xml +++ b/build_tools/cflags.xml @@ -10,6 +10,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="USE_HOARD_ALLOCATOR" displayname="Use the Hoard Memory Allocator instead of the default system one"> diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 5a62fd211..5f399fcdf 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -1,7 +1,9 @@ ALSA=@PBX_ALSA@ 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@ @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 242522 . +# From configure.ac Revision: 242889 . # 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 @@ -7630,8 +7632,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 @@ -43248,6 +43260,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 @@ -43339,8 +43353,6 @@ LDAP_LIB!$LDAP_LIB$ac_delim LDAP_INCLUDE!$LDAP_INCLUDE$ac_delim LDAP_DIR!$LDAP_DIR$ac_delim PBX_LDAP!$PBX_LDAP$ac_delim -LIBXML2_LIB!$LIBXML2_LIB$ac_delim -LIBXML2_INCLUDE!$LIBXML2_INCLUDE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -43382,6 +43394,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +LIBXML2_LIB!$LIBXML2_LIB$ac_delim +LIBXML2_INCLUDE!$LIBXML2_INCLUDE$ac_delim LIBXML2_DIR!$LIBXML2_DIR$ac_delim PBX_LIBXML2!$PBX_LIBXML2$ac_delim LTDL_LIB!$LTDL_LIB$ac_delim @@ -43477,8 +43491,6 @@ SDL_INCLUDE!$SDL_INCLUDE$ac_delim SDL_DIR!$SDL_DIR$ac_delim PBX_SDL!$PBX_SDL$ac_delim SDL_IMAGE_LIB!$SDL_IMAGE_LIB$ac_delim -SDL_IMAGE_INCLUDE!$SDL_IMAGE_INCLUDE$ac_delim -SDL_IMAGE_DIR!$SDL_IMAGE_DIR$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -43520,6 +43532,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +SDL_IMAGE_INCLUDE!$SDL_IMAGE_INCLUDE$ac_delim +SDL_IMAGE_DIR!$SDL_IMAGE_DIR$ac_delim PBX_SDL_IMAGE!$PBX_SDL_IMAGE$ac_delim OPENAIS_LIB!$OPENAIS_LIB$ac_delim OPENAIS_INCLUDE!$OPENAIS_INCLUDE$ac_delim @@ -43615,8 +43629,6 @@ PBX_DAHDI_HALF_FULL!$PBX_DAHDI_HALF_FULL$ac_delim GSM_INTERNAL!$GSM_INTERNAL$ac_delim CONFIG_LIBXML2!$CONFIG_LIBXML2$ac_delim PBX_MISDN_FAC_RESULT!$PBX_MISDN_FAC_RESULT$ac_delim -PBX_MISDN_FAC_ERROR!$PBX_MISDN_FAC_ERROR$ac_delim -CONFIG_NETSNMP!$CONFIG_NETSNMP$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -43658,6 +43670,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PBX_MISDN_FAC_ERROR!$PBX_MISDN_FAC_ERROR$ac_delim +CONFIG_NETSNMP!$CONFIG_NETSNMP$ac_delim PG_CONFIG!$PG_CONFIG$ac_delim PTLIB_CONFIG!$PTLIB_CONFIG$ac_delim PWLIBDIR!$PWLIBDIR$ac_delim @@ -43686,7 +43700,7 @@ PBX_GENERIC_ODBC!$PBX_GENERIC_ODBC$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; 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 943a1a135..6c86c985b 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/main/Makefile b/main/Makefile index d14a78abd..7e0613a3f 100644 --- a/main/Makefile +++ b/main/Makefile @@ -113,7 +113,7 @@ editline/libedit.a: CHECK_SUBDIR db1-ast/libdb1.a: CHECK_SUBDIR _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a -ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),) +ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),) ast_expr2.c ast_expr2.h: ast_expr2.y else ast_expr2.c ast_expr2.h: @@ -121,7 +121,7 @@ endif $(ECHO_PREFIX) echo " [BISON] $< -> $@" $(CMD_PREFIX) $(BISON) -o $@ -d --name-prefix=ast_yy ast_expr2.y -ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),) +ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),) ast_expr2f.c: ast_expr2.fl else ast_expr2f.c: diff --git a/res/Makefile b/res/Makefile index b8e33be14..aeb317004 100644 --- a/res/Makefile +++ b/res/Makefile @@ -45,7 +45,7 @@ $(if $(filter res_snmp,$(EMBEDDED_MODS)),modules.link,res_snmp.so): snmp/agent.o $(if $(filter res_ael_share,$(EMBEDDED_MODS)),modules.link,res_ael_share.so): ael/ael_lex.o ael/ael.tab.o ael/pval.o -ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),) +ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),) ael/ael_lex.c: ael/ael.flex else ael/ael_lex.c: @@ -54,7 +54,7 @@ endif $(CMD_PREFIX) (cd ael; $(FLEX) ael.flex; sed -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz ael_lex.c) $(CMD_PREFIX) (cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c) -ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),) +ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),) ael/ael.tab.c ael/ael.tab.h: ael/ael.y else ael/ael.tab.c ael/ael.tab.h: |