Link libcharon to checksum_builder in order to get rid of the fake symbols.

diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am
index aaa60b4..8c27d7d 100644 (file)
--- 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
 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
 
 BUILT_SOURCES = checksum.c
 CLEANFILES = checksum.c

diff --git a/src/checksum/checksum_builder.c b/src/checksum/checksum_builder.c
index be57f1d..d550bbe 100644 (file)
--- a/src/checksum/checksum_builder.c
+++ b/src/checksum/checksum_builder.c
@@ -20,11 +20,6 @@
 
 #include <library.h>
 
 
 #include <library.h>
 

-/* 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;
 int main(int argc, char* argv[])
 {
        int i;