From 5347a84f81cc97478bddb426d1ac5018387c6fff Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@strongswan.org>
Date: Mon, 11 Dec 2006 09:29:34 +0000
Subject: [PATCH] fixed HAVE_BACKTRACE checks starter Makefile now uses proper
 $(COMPILE) to build pluto objects

---
 src/charon/daemon.c                      | 6 ++++--
 src/libstrongswan/utils/leak_detective.c | 4 +++-
 src/starter/Makefile.am                  | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/charon/daemon.c b/src/charon/daemon.c
index f9e913c1b..2d15b58d2 100644
--- 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 efb055466..099e1170c 100644
--- 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 ff9c458b5..77d58e79b 100644
--- 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