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/branches/10@332447 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/build_tools/cflags-devmode.xml b/build_tools/cflags-devmode.xml
index 85d7bc8ce2d60c11da1705b9a45cacfc72c06030..e47e7160b41677f2b6c87da8cab748f8a74041a6 100644 (file)
--- 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 189820db107cc104e71abb4b35c6682f8e2cb833..7ba685c76220fcf85e0b737bb471deed44dd259c 100644 (file)
--- 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>