[asterisk-commits] tilghman: branch 1.6.0 r242972 - in /branches/1.6.0: ./ build_tools/ main/ res/

Mon Jan 25 15:53:32 CST 2010

Author: tilghman
Date: Mon Jan 25 15:53:28 2010
New Revision: 242972

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242972
Log:
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.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/build_tools/cflags.xml
    branches/1.6.0/build_tools/menuselect-deps.in
    branches/1.6.0/configure
    branches/1.6.0/configure.ac
    branches/1.6.0/main/Makefile
    branches/1.6.0/res/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/build_tools/cflags.xml
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/build_tools/cflags.xml?view=diff&rev=242972&r1=242971&r2=242972
==============================================================================

--- branches/1.6.0/build_tools/cflags.xml (original)
+++ branches/1.6.0/build_tools/cflags.xml Mon Jan 25 15:53:28 2010
@@ -13,6 +13,11 @@
 			<defaultenabled>yes</defaultenabled>
 		</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>

Modified: branches/1.6.0/build_tools/menuselect-deps.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/build_tools/menuselect-deps.in?view=diff&rev=242972&r1=242971&r2=242972
==============================================================================
--- branches/1.6.0/build_tools/menuselect-deps.in (original)
+++ branches/1.6.0/build_tools/menuselect-deps.in Mon Jan 25 15:53:28 2010
@@ -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@

Modified: branches/1.6.0/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configure.ac?view=diff&rev=242972&r1=242971&r2=242972
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Mon Jan 25 15:53:28 2010
@@ -224,7 +224,17 @@
 	])
 if test "x${ac_cv_path_BISON2}" = "x" ; then
 	BISON=:
-fi
+	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

Modified: branches/1.6.0/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/Makefile?view=diff&rev=242972&r1=242971&r2=242972
==============================================================================
--- branches/1.6.0/main/Makefile (original)
+++ branches/1.6.0/main/Makefile Mon Jan 25 15:53:28 2010
@@ -104,7 +104,7 @@
 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 @@
 	$(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:

Modified: branches/1.6.0/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/res/Makefile?view=diff&rev=242972&r1=242971&r2=242972
==============================================================================
--- branches/1.6.0/res/Makefile (original)
+++ branches/1.6.0/res/Makefile Mon Jan 25 15:53:28 2010
@@ -39,7 +39,7 @@
 
 $(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 @@
 	$(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:


