From: Tilghman Lesher Date: Mon, 25 Jan 2010 21:53:37 +0000 (+0000) Subject: Merged revisions 242967,242971 via svnmerge from X-Git-Tag: 1.6.1.15-rc1~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c5eaf9639c7c7dbdabd1e90c884bf7924de67b1;p=thirdparty%2Fasterisk.git Merged revisions 242967,242971 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r242967 | tilghman | 2010-01-25 15:38:33 -0600 (Mon, 25 Jan 2010) | 9 lines Merged revisions 242966 via svnmerge from 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 ........ ................ r242971 | tilghman | 2010-01-25 15:51:41 -0600 (Mon, 25 Jan 2010) | 9 lines Merged revisions 242969 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242969 | tilghman | 2010-01-25 15:50:22 -0600 (Mon, 25 Jan 2010) | 2 lines Err, and use the new menuselect define, too. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@242973 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml index 4567360d4b..c4d738b0da 100644 --- a/build_tools/cflags.xml +++ b/build_tools/cflags.xml @@ -10,6 +10,11 @@ + + bison + flex + no + diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index f63f591d43..b96b5d4e8c 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -1,7 +1,9 @@ ASOUND=@PBX_ALSA@ CRYPTO=@PBX_CRYPTO@ +BISON=@PBX_BISON@ CURL=@PBX_CURL@ DAHDI=@PBX_DAHDI@ +FLEX=@PBX_FLEX@ FREETDS=@PBX_FREETDS@ GMIME=@PBX_GMIME@ GNU_LD=@GNU_LD@ diff --git a/configure b/configure index 2c671ece5b..4ead1baf11 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 242523 . +# From configure.ac Revision: 242887 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -718,6 +718,8 @@ RUBBER KPATHSEA FETCH DOWNLOAD +PBX_BISON +PBX_FLEX SOXMIX MD5 acx_pthread_config @@ -7502,8 +7504,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 @@ -40951,6 +40963,8 @@ for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF 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 @@ -41044,8 +41058,6 @@ LUA_DIR!$LUA_DIR$ac_delim PBX_LUA!$PBX_LUA$ac_delim MISDN_LIB!$MISDN_LIB$ac_delim MISDN_INCLUDE!$MISDN_INCLUDE$ac_delim -MISDN_DIR!$MISDN_DIR$ac_delim -PBX_MISDN!$PBX_MISDN$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -41087,6 +41099,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +MISDN_DIR!$MISDN_DIR$ac_delim +PBX_MISDN!$PBX_MISDN$ac_delim NBS_LIB!$NBS_LIB$ac_delim NBS_INCLUDE!$NBS_INCLUDE$ac_delim NBS_DIR!$NBS_DIR$ac_delim @@ -41182,8 +41196,6 @@ PBX_SPEEX!$PBX_SPEEX$ac_delim SPEEX_PREPROCESS_LIB!$SPEEX_PREPROCESS_LIB$ac_delim SPEEX_PREPROCESS_INCLUDE!$SPEEX_PREPROCESS_INCLUDE$ac_delim SPEEX_PREPROCESS_DIR!$SPEEX_PREPROCESS_DIR$ac_delim -PBX_SPEEX_PREPROCESS!$PBX_SPEEX_PREPROCESS$ac_delim -SPEEXDSP_LIB!$SPEEXDSP_LIB$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -41225,6 +41237,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PBX_SPEEX_PREPROCESS!$PBX_SPEEX_PREPROCESS$ac_delim +SPEEXDSP_LIB!$SPEEXDSP_LIB$ac_delim SPEEXDSP_INCLUDE!$SPEEXDSP_INCLUDE$ac_delim SPEEXDSP_DIR!$SPEEXDSP_DIR$ac_delim PBX_SPEEXDSP!$PBX_SPEEXDSP$ac_delim @@ -41320,8 +41334,6 @@ PBX_H323!$PBX_H323$ac_delim PBX_IXJUSER!$PBX_IXJUSER$ac_delim CONFIG_SDL!$CONFIG_SDL$ac_delim CONFIG_GTK!$CONFIG_GTK$ac_delim -PKGCONFIG!$PKGCONFIG$ac_delim -_libcurl_config!$_libcurl_config$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -41363,10 +41375,12 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PKGCONFIG!$PKGCONFIG$ac_delim +_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` = 1; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; 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 2a4f20c158..3d0c0ed3e1 100644 --- a/configure.ac +++ b/configure.ac @@ -224,7 +224,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 71eaacc2c2..8f242bdaff 100644 --- a/main/Makefile +++ b/main/Makefile @@ -110,7 +110,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: @@ -118,7 +118,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 7e3d55a626..a0c750e43a 100644 --- a/res/Makefile +++ b/res/Makefile @@ -43,7 +43,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: @@ -52,7 +52,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: