[asterisk-commits] rizzo: branch rizzo/video_v2 r82492 - in /team/rizzo/video_v2: main/ utils/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Sat Sep 15 12:04:56 CDT 2007


Author: rizzo
Date: Sat Sep 15 12:04:56 2007
New Revision: 82492

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82492
Log:
Makefile: don't force -lexecinfo, in case we should include ../makeopts
    to fetch the correct build environment.

main/astobj2.c: more robust check on HAVE_BKTR - not sure if it is
    really necessary.

Modified:
    team/rizzo/video_v2/main/astobj2.c
    team/rizzo/video_v2/utils/Makefile

Modified: team/rizzo/video_v2/main/astobj2.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/video_v2/main/astobj2.c?view=diff&rev=82492&r1=82491&r2=82492
==============================================================================
--- team/rizzo/video_v2/main/astobj2.c (original)
+++ team/rizzo/video_v2/main/astobj2.c Sat Sep 15 12:04:56 2007
@@ -67,7 +67,7 @@
 
 static struct ao2_stats ao2;
 
-#ifndef HAVE_BKTR	/* backtrace support */
+#if !defined(HAVE_BKTR) || HAVE_BKTR == 0	/* backtrace support */
 void ao2_bt(void) {}
 #else
 #include <execinfo.h>    /* for backtrace */

Modified: team/rizzo/video_v2/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/video_v2/utils/Makefile?view=diff&rev=82492&r1=82491&r2=82492
==============================================================================
--- team/rizzo/video_v2/utils/Makefile (original)
+++ team/rizzo/video_v2/utils/Makefile Sat Sep 15 12:04:56 2007
@@ -43,7 +43,7 @@
   UTILS:=$(filter-out conf2ael,$(UTILS))
 endif
 
-LIBS+=  $(ASTLDFLAGS) -lexecinfo
+LIBS+=  $(ASTLDFLAGS)
 
 all: $(UTILS)
 




More information about the asterisk-commits mailing list