aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2010-03-16 11:05:01 +0100
committerTobias Brunner <tobias@strongswan.org>2010-03-19 13:34:53 +0100
commitef87a61efdfff5c00d1e8ffb7a560ed5ceac7cd1 (patch)
tree3c6d31ea204e98cb5a75162430817fcf81887cc8 /src
parent454faa47de3c804be66c0c8b1810344f492b0b4c (diff)
downloadstrongswan-ef87a61efdfff5c00d1e8ffb7a560ed5ceac7cd1.tar.bz2
strongswan-ef87a61efdfff5c00d1e8ffb7a560ed5ceac7cd1.tar.xz
Explicitly link charon to libstrongswan.
Also fixed the reference to the pthread library.
Diffstat (limited to 'src')
-rw-r--r--src/charon/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index b3f395402..4a184d76a 100644
--- a/src/charon/Makefile.am
+++ b/src/charon/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \
-DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\"
-charon_LDADD = $(top_builddir)/src/libcharon/libcharon.la -lm $(PTHREAD) $(DLLIB)
+charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(top_builddir)/src/libcharon/libcharon.la -lm $(PTHREADLIB) $(DLLIB)
#EXTRA_DIST = Android.mk