diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2011-11-08 17:53:37 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2011-11-08 18:35:11 +0100 |
| commit | 9192f78f709e4859455431bc72ae883bdd4f0c9b (patch) | |
| tree | 652b7b1119216692b1abe6d346008fe1cf46119c /src/checksum | |
| parent | 48e87e12ab3ca0bb1cebd2b6f05a0cf6ab16fb1e (diff) | |
| download | strongswan-9192f78f709e4859455431bc72ae883bdd4f0c9b.tar.bz2 strongswan-9192f78f709e4859455431bc72ae883bdd4f0c9b.tar.xz | |
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.
Diffstat (limited to 'src/checksum')
| -rw-r--r-- | src/checksum/Makefile.am | 3 | ||||
| -rw-r--r-- | 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 <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 */ |