[svn-commits] tilghman: trunk r332448 - in /trunk: ./ build_tools/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Aug 18 09:49:28 2011
New Revision: 332448

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

Modified:
    trunk/   (props changed)
    trunk/build_tools/cflags-devmode.xml
    trunk/build_tools/cflags.xml

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

Modified: trunk/build_tools/cflags-devmode.xml
URL: http://svnview.digium.com/svn/asterisk/trunk/build_tools/cflags-devmode.xml?view=diff&rev=332448&r1=332447&r2=332448
==============================================================================
--- trunk/build_tools/cflags-devmode.xml (original)
+++ trunk/build_tools/cflags-devmode.xml Thu Aug 18 09:49:28 2011
@@ -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>

Modified: trunk/build_tools/cflags.xml
URL: http://svnview.digium.com/svn/asterisk/trunk/build_tools/cflags.xml?view=diff&rev=332448&r1=332447&r2=332448
==============================================================================
--- trunk/build_tools/cflags.xml (original)
+++ trunk/build_tools/cflags.xml Thu Aug 18 09:49:28 2011
@@ -16,6 +16,11 @@
 			<defaultenabled>no</defaultenabled>
 		</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>