Make integrity tests compatible with libcharon.
authorTobias Brunner <tobias@strongswan.org>
Fri, 12 Mar 2010 16:20:36 +0000 (17:20 +0100)
committerTobias Brunner <tobias@strongswan.org>
Fri, 19 Mar 2010 12:34:53 +0000 (13:34 +0100)
This does currently not work because libtool relinks libcharon on
install, thus changing the checksum.

src/checksum/Makefile.am
src/checksum/checksum_builder.c

index d0413e6..4533eb8 100644 (file)
@@ -12,10 +12,11 @@ CLEANFILES = checksum.c
 INCLUDES = -I$(top_srcdir)/src/libstrongswan
 AM_CFLAGS = -rdynamic
 
-libs = $(shell find $(top_builddir)/src/libstrongswan $(top_builddir)/src/charon \
+libs = $(shell find $(top_builddir)/src/libstrongswan $(top_builddir)/src/libcharon \
                        -name 'libstrongswan*.so')
 
 if USE_CHARON
+  libs += $(top_builddir)/src/libcharon/.libs/libcharon.so
   libs += $(top_builddir)/src/charon/.libs/charon
 endif
 
index 964cc71..be57f1d 100644 (file)
@@ -78,6 +78,11 @@ int main(int argc, char* argv[])
                        name = strdup("libstrongswan\",");
                        sname = strdup("library_init");
                }
+               else if (strstr(path, "libcharon.so"))
+               {
+                       name = strdup("libcharon\",");
+                       sname = strdup("libcharon_init");
+               }
                else if (strstr(path, "pool"))
                {
                        name = strdup("pool\",");