aboutsummaryrefslogtreecommitdiffstats
path: root/build_tools
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-25 21:53:37 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-25 21:53:37 +0000
commit04adcd4050ddc83b924ed24e721cc23b407f758d (patch)
treedbe3c25e847af10cfb8efab4d171e4eeba5d8c3a /build_tools
parent1ea432bb9ff23ee3c8dfb5bc2cb7350787bdaf7c (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@242973 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
-rw-r--r--build_tools/cflags.xml5
-rw-r--r--build_tools/menuselect-deps.in2
2 files changed, 7 insertions, 0 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 f63f591d4..b96b5d4e8 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@