denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Link pluto and charon to libhydra, fixes monolithic build.

Browse Source
This commit is contained in:
Tobias Brunner
2010-03-24 18:53:10 +01:00
parent bde5163ae0
commit 39856897e6
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/Makefile.am
+5 -1
View File
@@ -7,7 +7,11 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
-DIPSEC_DIR=\"${ipsecdir}\" \ -DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PIDDIR=\"${piddir}\"
charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(top_builddir)/src/libcharon/libcharon.la -lm $(PTHREADLIB) $(DLLIB) charon_LDADD = \
$(top_builddir)/src/libstrongswan/libstrongswan.la \
$(top_builddir)/src/libhydra/libhydra.la \
$(top_builddir)/src/libcharon/libcharon.la \
-lm $(PTHREADLIB) $(DLLIB)
EXTRA_DIST = Android.mk EXTRA_DIST = Android.mk
src/pluto/Makefile.am
+2
View File
@@ -54,6 +54,7 @@ rsaref/pkcs11t.h rsaref/pkcs11.h rsaref/unix.h rsaref/pkcs11f.h
_pluto_adns_SOURCES = adns.c adns.h _pluto_adns_SOURCES = adns.c adns.h
LIBSTRONGSWANDIR=$(top_builddir)/src/libstrongswan LIBSTRONGSWANDIR=$(top_builddir)/src/libstrongswan
LIBHYDRADIR=$(top_builddir)/src/libhydra
LIBFREESWANDIR=$(top_builddir)/src/libfreeswan LIBFREESWANDIR=$(top_builddir)/src/libfreeswan
INCLUDES = \ INCLUDES = \
@@ -74,6 +75,7 @@ AM_CFLAGS = \
pluto_LDADD = \ pluto_LDADD = \
$(LIBSTRONGSWANDIR)/libstrongswan.la \ $(LIBSTRONGSWANDIR)/libstrongswan.la \
$(LIBHYDRADIR)/libhydra.la \
$(LIBFREESWANDIR)/libfreeswan.a \ $(LIBFREESWANDIR)/libfreeswan.a \
-lresolv $(PTHREADLIB) $(DLLIB) -lresolv $(PTHREADLIB) $(DLLIB)