svn commit: r947324 - in /trafficserver/traffic/trunk: configure.ac libinktomi++/ink_config.h.in libinktomi++/ink_stack_trace.cc

[mt...@apache.org]

Author: mturk
Date: Sat May 22 19:10:37 2010
New Revision: 947324

URL: http://svn.apache.org/viewvc?rev=947324&view=rev
Log:
TS-366: Fix redundant checks. We cannot have backtrace without execinfo.h

Modified:
    trafficserver/traffic/trunk/configure.ac
    trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
    trafficserver/traffic/trunk/libinktomi++/ink_stack_trace.cc

Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=947324&r1=947323&r2=947324&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Sat May 22 19:10:37 2010
@@ -701,18 +701,18 @@ fi
 
 has_backtrace=0
 # Check for backtrace() support
-AC_CHECK_HEADERS([execinfo.h], [have_backtrace=yes],[])
-if test "x${have_backtrace}" = "xyes"; then
+ATS_FLAG_HEADERS([execinfo.h], [has_backtrace=1],[])
+if test "${has_backtrace}" = "1"; then
   # FreeBSD requires '/usr/ports/devel/libexecinfo' for gdb style backtrace() support
   AC_CHECK_LIB([execinfo], [backtrace], [have_backtrace_lib=yes
                                          AC_SUBST([LIBEXECINFO],["-lexecinfo"])])
   if test "x${have_backtrace_lib}" = "xyes"; then
     AC_MSG_NOTICE([Using backtrace library '-lexecinfo'])
-    has_backtrace=1
   fi
 else
   AC_MSG_WARN([No backtrace() support found])
 fi
+AC_SUBST(execinfoh)
 AC_SUBST(has_backtrace)
 
 use_libev=0

Modified: trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_config.h.in?rev=947324&r1=947323&r2=947324&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_config.h.in (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_config.h.in Sat May 22 19:10:37 2010
@@ -78,6 +78,7 @@
 #define ATS_HAVE_NET_PPP_DEFS_H         @net_ppp_defsh@
 #define ATS_HAVE_NETINET_IP_H           @netinet_iph@
 #define ATS_HAVE_NETINET_IP_ICMP_H      @netinet_ip_icmph@
+#define ATS_HAVE_EXECINFO_H             @execinfoh@
 
 /* Libraries */
 #define ATS_HAVE_ZLIB_H                 @zlibh@

Modified: trafficserver/traffic/trunk/libinktomi++/ink_stack_trace.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_stack_trace.cc?rev=947324&r1=947323&r2=947324&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_stack_trace.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_stack_trace.cc Sat May 22 19:10:37 2010
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#if defined(HAVE_EXECINFO_H) && ATS_HAS_BACKTRACE
+#if ATS_HAS_BACKTRACE
 
 #include <execinfo.h>           /* for backtrace_symbols, etc. */
 #include <signal.h>
@@ -114,7 +114,7 @@ ink_stack_trace_dump(int sighandler_fram
   backtrace_symbols_fd(stack, btl, 2);
 }
 
-#else  /* !(HAVE_EXECINFO_H && ATS_HAS_BACKTRACE) */
+#else  /* !ATS_HAS_BACKTRACE */
 
 void
 ink_stack_trace_dump(int sighandler_frame)
@@ -124,4 +124,4 @@ ink_stack_trace_dump(int sighandler_fram
       return;
 }
 
-#endif  /* !(HAVE_EXECINFO_H && AST_HAS_BACKTRACE) */
+#endif  /* ATS_HAS_BACKTRACE */