From 9192f78f709e4859455431bc72ae883bdd4f0c9b Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 8 Nov 2011 17:53:37 +0100 Subject: [PATCH] Don't link libtnccs to checksum_builder. Linking is only required for libraries defining global symbols used by plugins to which the plugins do not link themselves. --- src/checksum/Makefile.am | 3 --- src/checksum/checksum_builder.c | 12 ++---------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am index 303f0b318..9e8774515 100644 --- a/src/checksum/Makefile.am +++ b/src/checksum/Makefile.am @@ -32,9 +32,6 @@ endif if USE_LIBTNCCS libs += $(top_builddir)/src/libtnccs/.libs/libtnccs.so - checksum_builder_LDADD += $(top_builddir)/src/libtnccs/libtnccs.la - INCLUDES += -I$(top_srcdir)/src/libtncif -I$(top_srcdir)/src/libtnccs - AM_CFLAGS += -DHAS_TNC endif if USE_SIMAKA diff --git a/src/checksum/checksum_builder.c b/src/checksum/checksum_builder.c index 4bc387da8..59fec100e 100644 --- a/src/checksum/checksum_builder.c +++ b/src/checksum/checksum_builder.c @@ -23,10 +23,6 @@ #include #include -#ifdef HAS_TNC -#include -#endif - /* we need to fake the pluto symbol to dlopen() the xauth plugin */ void *pluto; @@ -133,15 +129,11 @@ int main(int argc, char* argv[]) { int i; - /* forces link against libhydra/libcharon */ + /* forces link against libhydra/libcharon, imports symbols needed to + * dlopen plugins */ hydra = NULL; charon = NULL; -#ifdef HAS_TNC - /* forces link against libtnccs */ - tnc = NULL; -#endif - /* avoid confusing leak reports in build process */ setenv("LEAK_DETECTIVE_DISABLE", "1", 0); /* don't use a strongswan.conf, forces integrity check to disabled */