Explicitly link charon to libstrongswan.

Also fixed the reference to the pthread library.

diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index b3f395402d993000a07bfc4e12f0a0ab3dfc8bd1..4a184d76a5e0c2f69844737ed22d5e172d43b693 100644 (file)
--- 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