aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2009-12-10 11:08:01 +0100
committerTobias Brunner <tobias@strongswan.org>2009-12-23 17:02:26 +0100
commit070ac5b0b79517e5414ddc21c6f46265de2a28a4 (patch)
tree8a57e40e1f1bd9d8d0f1bb628ce0fd86c29f7274 /src
parent866dc0134a27a14b7d85739c221259a832d313b8 (diff)
downloadstrongswan-070ac5b0b79517e5414ddc21c6f46265de2a28a4.tar.bz2
strongswan-070ac5b0b79517e5414ddc21c6f46265de2a28a4.tar.xz
Check if libpthread is required or not.
Diffstat (limited to 'src')
-rw-r--r--src/charon/Makefile.am2
-rw-r--r--src/libfast/Makefile.am2
-rw-r--r--src/libstrongswan/Makefile.am2
-rw-r--r--src/pluto/Makefile.am2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index 1d6fa6dbe..2a82b4be7 100644
--- a/src/charon/Makefile.am
+++ b/src/charon/Makefile.am
@@ -102,7 +102,7 @@ INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/
AM_CFLAGS = -rdynamic \
-DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\"
-charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lpthread -lm $(DLLIB) $(SOCKLIB)
+charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB)
# compile options
#################
diff --git a/src/libfast/Makefile.am b/src/libfast/Makefile.am
index 6104f335d..870dcd6f1 100644
--- a/src/libfast/Makefile.am
+++ b/src/libfast/Makefile.am
@@ -3,6 +3,6 @@ lib_LTLIBRARIES = libfast.la
libfast_la_SOURCES = context.h dispatcher.c request.h session.h \
controller.h dispatcher.h request.c session.c filter.h
libfast_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la \
- -lfcgi -lpthread -lneo_cgi -lneo_cs -lneo_utl -lz
+ -lfcgi -lneo_cgi -lneo_cs -lneo_utl -lz $(PTHREADLIB)
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I/usr/include/ClearSilver
AM_CFLAGS = -rdynamic
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 301505071..fd297a0b7 100644
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -58,7 +58,7 @@ utils/optionsfrom.c utils/optionsfrom.h \
utils/backtrace.c utils/backtrace.h \
plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h
-libstrongswan_la_LIBADD = -lpthread $(DLLIB) $(BTLIB) $(SOCKLIB) $(RTLIB)
+libstrongswan_la_LIBADD = $(PTHREADLIB) $(DLLIB) $(BTLIB) $(SOCKLIB) $(RTLIB)
INCLUDES = -I$(top_srcdir)/src/libstrongswan
AM_CFLAGS = \
diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index 14a13a52b..b83e4be33 100644
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -75,7 +75,7 @@ AM_CFLAGS = \
pluto_LDADD = \
$(LIBSTRONGSWANDIR)/libstrongswan.la \
$(LIBFREESWANDIR)/libfreeswan.a \
--lresolv -lpthread $(DLLIB)
+-lresolv $(PTHREADLIB) $(DLLIB)
_pluto_adns_LDADD = \
$(LIBFREESWANDIR)/libfreeswan.a \