kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 09:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 242967,242971 via svnmerge from

Browse Source 
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.0@242972 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-01-25 21:53:28 +00:00
parent 5c85c4dade
commit 8c3301a90d
6 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build_tools/cflags.xml
View File

@@ -14,6 +14,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="LOTS_OF_SPANS" displayname="More than 32 DAHDI spans">

2
build_tools/menuselect-deps.in
View File

@@ -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@

30
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 242524 .
# From configure.ac Revision: 242885 .
# 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
@@ -7504,8 +7506,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
@@ -39891,6 +39903,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
@@ -39984,8 +39998,6 @@ 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
PBX_NBS!$PBX_NBS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -40027,6 +40039,8 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
NBS_DIR!$NBS_DIR$ac_delim
PBX_NBS!$PBX_NBS$ac_delim
NCURSES_LIB!$NCURSES_LIB$ac_delim
NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim
NCURSES_DIR!$NCURSES_DIR$ac_delim
@@ -40122,8 +40136,6 @@ 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
PBX_SDL_IMAGE!$PBX_SDL_IMAGE$ac_delim
SPEEX_LIB!$SPEEX_LIB$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -40165,6 +40177,8 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
PBX_SDL_IMAGE!$PBX_SDL_IMAGE$ac_delim
SPEEX_LIB!$SPEEX_LIB$ac_delim
SPEEX_INCLUDE!$SPEEX_INCLUDE$ac_delim
SPEEX_DIR!$SPEEX_DIR$ac_delim
PBX_SPEEX!$PBX_SPEEX$ac_delim
@@ -40260,8 +40274,6 @@ OPENH323_SUFFIX!$OPENH323_SUFFIX$ac_delim
OPENH323_BUILD!$OPENH323_BUILD$ac_delim
CONFIG_GMIME!$CONFIG_GMIME$ac_delim
EDITLINE_LIB!$EDITLINE_LIB$ac_delim
PBX_H323!$PBX_H323$ac_delim
PBX_IXJUSER!$PBX_IXJUSER$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -40303,6 +40315,8 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
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
@@ -40310,7 +40324,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` = 5; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

10
configure.ac
View File

@@ -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

4
main/Makefile
View File

@@ -104,7 +104,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:
@@ -112,7 +112,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:

4
res/Makefile
View File

@@ -39,7 +39,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:
@@ -48,7 +48,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: