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.
This commit is contained in:
@@ -32,9 +32,6 @@ endif
|
|||||||
|
|
||||||
if USE_LIBTNCCS
|
if USE_LIBTNCCS
|
||||||
libs += $(top_builddir)/src/libtnccs/.libs/libtnccs.so
|
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
|
endif
|
||||||
|
|
||||||
if USE_SIMAKA
|
if USE_SIMAKA
|
||||||
|
|||||||
@@ -23,10 +23,6 @@
|
|||||||
#include <daemon.h>
|
#include <daemon.h>
|
||||||
#include <utils/enumerator.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 */
|
/* we need to fake the pluto symbol to dlopen() the xauth plugin */
|
||||||
void *pluto;
|
void *pluto;
|
||||||
|
|
||||||
@@ -133,15 +129,11 @@ int main(int argc, char* argv[])
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* forces link against libhydra/libcharon */
|
/* forces link against libhydra/libcharon, imports symbols needed to
|
||||||
|
* dlopen plugins */
|
||||||
hydra = NULL;
|
hydra = NULL;
|
||||||
charon = NULL;
|
charon = NULL;
|
||||||
|
|
||||||
#ifdef HAS_TNC
|
|
||||||
/* forces link against libtnccs */
|
|
||||||
tnc = NULL;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* avoid confusing leak reports in build process */
|
/* avoid confusing leak reports in build process */
|
||||||
setenv("LEAK_DETECTIVE_DISABLE", "1", 0);
|
setenv("LEAK_DETECTIVE_DISABLE", "1", 0);
|
||||||
/* don't use a strongswan.conf, forces integrity check to disabled */
|
/* don't use a strongswan.conf, forces integrity check to disabled */
|
||||||
|
|||||||
Reference in New Issue
Block a user