aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2011-05-25 10:38:31 +0200
committerMartin Willi <martin@revosec.ch>2011-05-25 10:40:30 +0200
commitf147b731e04137a1dbfb918f9844a7ad19cef2cc (patch)
treed40c7c8c3451875d27ffbf24761a33e3983104a1
parent3dbc5dfeda25ebdf0f356389979bbb1e0fc2952e (diff)
downloadstrongswan-f147b731e04137a1dbfb918f9844a7ad19cef2cc.tar.bz2
strongswan-f147b731e04137a1dbfb918f9844a7ad19cef2cc.tar.xz
Force link of checksum builder against libhydra/libcharon
-rw-r--r--src/checksum/Makefile.am3
-rw-r--r--src/checksum/checksum_builder.c6
2 files changed, 8 insertions, 1 deletions
diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am
index f385194fb..4d0f6bf7f 100644
--- a/src/checksum/Makefile.am
+++ b/src/checksum/Makefile.am
@@ -13,7 +13,8 @@ checksum_builder_LDADD = \
BUILT_SOURCES = checksum.c
CLEANFILES = checksum.c
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+ -I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic \
-DS_PLUGINS=\""${s_plugins}\"" -DS_PATH=\""${top_builddir}/src/libstrongswan/plugins\""
diff --git a/src/checksum/checksum_builder.c b/src/checksum/checksum_builder.c
index b1ed0b599..94b04c637 100644
--- a/src/checksum/checksum_builder.c
+++ b/src/checksum/checksum_builder.c
@@ -19,6 +19,8 @@
#include <dlfcn.h>
#include <library.h>
+#include <hydra.h>
+#include <daemon.h>
#include <utils/enumerator.h>
/* we need to fake the pluto symbol to dlopen() the xauth plugin */
@@ -127,6 +129,10 @@ int main(int argc, char* argv[])
{
int i;
+ /* forces link against libhydra/libcharon */
+ hydra = NULL;
+ charon = NULL;
+
/* avoid confusing leak reports in build process */
setenv("LEAK_DETECTIVE_DISABLE", "1", 0);
library_init(NULL);