[svn-commits] rizzo: trunk r89506 - in /trunk: configure configure.ac utils/Makefile

[SVN commits to the Digium repositories]

Author: rizzo
Date: Wed Nov 21 15:30:24 2007
New Revision: 89506

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89506
Log:
enable support for stack backtrace for stuff built in utils/
(this was present in the main tree but forgotten here).


Modified:
    trunk/configure
    trunk/configure.ac
    trunk/utils/Makefile

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?view=diff&rev=89506&r1=89505&r2=89506
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Wed Nov 21 15:30:24 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 89472 .
+# From configure.ac Revision: 89475 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -34749,7 +34749,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lexecinfo ${pbxlibdir} -lexecinfo $LIBS"
+LIBS="-lexecinfo ${pbxlibdir}  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -34815,7 +34815,7 @@
 
    # now check for the header.
    if test "${AST_BKTR_FOUND}" = "yes"; then
-      BKTR_LIB="${pbxlibdir} -lexecinfo -lexecinfo"
+      BKTR_LIB="${pbxlibdir} -lexecinfo "
       # if --with-BKTR=DIR has been specified, use it.
       if test "x${BKTR_DIR}" != "x"; then
 	 BKTR_INCLUDE="-I${BKTR_DIR}/include"

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=89506&r1=89505&r2=89506
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Nov 21 15:30:24 2007
@@ -861,7 +861,7 @@
 
 AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], [])
 
-AST_EXT_LIB_CHECK([BKTR], [execinfo], [backtrace], [execinfo.h], [-lexecinfo])
+AST_EXT_LIB_CHECK([BKTR], [execinfo], [backtrace], [execinfo.h])
 
 # possible places for oss definitions
 AST_EXT_LIB_CHECK([OSS], [ossaudio], [], [linux/soundcard.h])

Modified: trunk/utils/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/utils/Makefile?view=diff&rev=89506&r1=89505&r2=89506
==============================================================================
--- trunk/utils/Makefile (original)
+++ trunk/utils/Makefile Wed Nov 21 15:30:24 2007
@@ -18,6 +18,8 @@
 # to get check_expr, add it to the ALL_UTILS list
 ALL_UTILS:=astman smsq stereorize streamplayer aelparse muted check_expr conf2ael hashtest2 hashtest
 UTILS:=$(ALL_UTILS)
+
+LIBS += $(BKTR_LIB)	# astobj2 with devmode uses backtrace
 
 include $(ASTTOPDIR)/Makefile.rules