fixed HAVE_BACKTRACE checks

starter Makefile now uses proper $(COMPILE) to build pluto objects

diff --git a/src/charon/daemon.c b/src/charon/daemon.c
index f9e913c1baa09c635e83067f68352998df0845b8..2d15b58d21a46967f24b10f69d2613fb24a9ef67 100644 (file)
--- a/src/charon/daemon.c
+++ b/src/charon/daemon.c
@@ -29,10 +29,12 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <time.h>
-#include <execinfo.h>
 #include <string.h>
 #include <getopt.h>
 #include <errno.h>
+#ifdef HAVE_BACKTRACE
+# include <execinfo.h>
+#endif /* HAVE_BACKTRACE */
 
 #include "daemon.h"
 
@@ -285,7 +287,7 @@ static void initialize(private_daemon_t *this, bool strict, bool syslog,
  */
 void signal_handler(int signal)
 {
-#ifndef HAVE_BACKTRACE
+#ifdef HAVE_BACKTRACE
        void *array[20];
        size_t size;
        char **strings;

diff --git a/src/libstrongswan/utils/leak_detective.c b/src/libstrongswan/utils/leak_detective.c
index efb055466639021632579d12f781aa62dc0412a6..099e1170c41f2d55453291fe73c5acf8d3b9c8c9 100644 (file)
--- a/src/libstrongswan/utils/leak_detective.c
+++ b/src/libstrongswan/utils/leak_detective.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <malloc.h>
-#include <execinfo.h>
 #include <signal.h> 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -34,6 +33,9 @@
 #include <pthread.h>
 #include <netdb.h>
 #include <printf.h>
+#ifdef HAVE_BACKTRACE
+# include <execinfo.h>
+#endif /* HAVE_BACKTRACE */
 
 #include "leak_detective.h"
 

diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index ff9c458b571c1ab9a74f5493def224fc21622436..77d58e79b16ef732cba14a0aee965e66fd8bdf07 100644 (file)
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -28,10 +28,10 @@ keywords.c: keywords.txt keywords.h
                $(GPERF) -C -G -t < keywords.txt > keywords.c
 
 loglite.o:     $(OPENACDIR)/loglite.c $(PLUTODIR)/log.h
-               $(CC) $(AM_CFLAGS) $(INCLUDES) -c -o $@ $<
+               $(COMPILE) -c -o $@ $<
 
 defs.o:                $(PLUTODIR)/defs.c $(PLUTODIR)/defs.h
-               $(CC) $(AM_CFLAGS) $(INCLUDES) -c -o $@ $<
+               $(COMPILE) -c -o $@ $<
 
 install-exec-local :
                test -e "$(sysconfdir)/ipsec.conf" || $(INSTALL) ipsec.conf $(sysconfdir)/ipsec.conf