[asterisk-commits] tilghman: trunk r242967 - in /trunk: ./ build_tools/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Jan 25 15:38:33 2010
New Revision: 242967

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

Modified:
    trunk/   (props changed)
    trunk/build_tools/cflags.xml
    trunk/build_tools/menuselect-deps.in
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/build_tools/cflags.xml
URL: http://svnview.digium.com/svn/asterisk/trunk/build_tools/cflags.xml?view=diff&rev=242967&r1=242966&r2=242967
==============================================================================
--- trunk/build_tools/cflags.xml (original)
+++ trunk/build_tools/cflags.xml Mon Jan 25 15:38:33 2010
@@ -9,6 +9,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: trunk/build_tools/menuselect-deps.in
URL: http://svnview.digium.com/svn/asterisk/trunk/build_tools/menuselect-deps.in?view=diff&rev=242967&r1=242966&r2=242967
==============================================================================
--- trunk/build_tools/menuselect-deps.in (original)
+++ trunk/build_tools/menuselect-deps.in Mon Jan 25 15:38:33 2010
@@ -1,8 +1,10 @@
 ALSA=@PBX_ALSA@
 BLUETOOTH=@PBX_BLUETOOTH@
 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@

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=242967&r1=242966&r2=242967
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Jan 25 15:38:33 2010
@@ -241,7 +241,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