From 48aa81a67ae435462259284437d81eee353b4cd2 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 24 Mar 2010 17:54:07 +0100 Subject: [PATCH] Link libcharon to checksum_builder in order to get rid of the fake symbols. --- src/checksum/Makefile.am | 5 ++++- src/checksum/checksum_builder.c | 5 ----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am index aaa60b4d4..8c27d7dbf 100644 --- a/src/checksum/Makefile.am +++ b/src/checksum/Makefile.am @@ -5,7 +5,10 @@ nodist_libchecksum_la_SOURCES = checksum.c libchecksum_la_LDFLAGS = -module -avoid-version checksum_builder_SOURCES = checksum_builder.c -checksum_builder_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(DLLIB) +checksum_builder_LDADD = \ + $(top_builddir)/src/libstrongswan/libstrongswan.la \ + $(top_builddir)/src/libcharon/libcharon.la \ + $(DLLIB) BUILT_SOURCES = checksum.c CLEANFILES = checksum.c diff --git a/src/checksum/checksum_builder.c b/src/checksum/checksum_builder.c index be57f1dc0..d550bbeb0 100644 --- a/src/checksum/checksum_builder.c +++ b/src/checksum/checksum_builder.c @@ -20,11 +20,6 @@ #include -/* we need to fake some charon symbols to dlopen() its plugins */ -void *charon, *eap_type_names, *auth_class_names, *protocol_id_names, -*action_names, *ipsec_mode_names, *ike_sa_state_names, *child_sa_state_names, -*policy_dir_names, *ipcomp_transform_names, *debug_names, *controller_cb_empty; - int main(int argc, char* argv[]) { int i;