From ee277c8891e074fd30564b64e534fee6e37781ec Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 18 Aug 2011 14:49:28 +0000
Subject: [PATCH] Merged revisions 332447 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r332447 | tilghman | 2011-08-18 09:48:40 -0500 (Thu, 18 Aug 2011) | 9 lines
Merged revisions 332446 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r332446 | tilghman | 2011-08-18 09:46:54 -0500 (Thu, 18 Aug 2011) | 2 lines
Move BETTER_BACKTRACES out of development mode, as it's useful when DEBUG_THREADS is enabled.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332448 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
build_tools/cflags-devmode.xml | 5 -----
build_tools/cflags.xml | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/build_tools/cflags-devmode.xml b/build_tools/cflags-devmode.xml
index 85d7bc8ce2..e47e7160b4 100644
--- a/build_tools/cflags-devmode.xml
+++ b/build_tools/cflags-devmode.xml
@@ -22,9 +22,4 @@
</member>
<member name="TEST_FRAMEWORK" displayname="Enable Test Framework API">
</member>
- <member name="BETTER_BACKTRACES" displayname="Use libbfd to generate better inline backtraces">
- <depend>BFD</depend>
- <depend>DLADDR</depend>
- <defaultenabled>no</defaultenabled>
- </member>
</category>
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index 189820db10..7ba685c762 100644
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -17,6 +17,11 @@
</member>
<member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
</member>
+ <member name="BETTER_BACKTRACES" displayname="Use libbfd (GPL) to generate better inline backtraces">
+ <depend>BFD</depend>
+ <depend>DLADDR</depend>
+ <defaultenabled>no</defaultenabled>
+ </member>
<member name="USE_HOARD_ALLOCATOR" displayname="Use the Hoard Memory Allocator instead of the default system one">
<defaultenabled>no</defaultenabled>
<depend>hoard</depend>
--
GitLab