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.

diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am
index 303f0b318751b7147ba79bd536eecb798c1ffa20..9e8774515d3536653e72d41f064c83fa6e3ff263 100644 (file)
--- 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 4bc387da8b7748db18e882bb02d41a751dbfdfb1..59fec100e2679c3d54d37a24393f82437bc35fa9 100644 (file)
--- a/src/checksum/checksum_builder.c
+++ b/src/checksum/checksum_builder.c
@@ -23,10 +23,6 @@
 #include <daemon.h>
 #include <utils/enumerator.h>
 
-#ifdef HAS_TNC
-#include <tnc/tnc.h>
-#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 */