Fixing integrity-checks after moving the attr-sql plugin and adding libhydra.
authorTobias Brunner <tobias@strongswan.org>
Wed, 24 Mar 2010 10:00:11 +0000 (11:00 +0100)
committerTobias Brunner <tobias@strongswan.org>
Wed, 24 Mar 2010 17:53:09 +0000 (18:53 +0100)
src/checksum/Makefile.am
src/checksum/checksum_builder.c

index 8c27d7d..ed87e62 100644 (file)
@@ -15,9 +15,15 @@ CLEANFILES = checksum.c
 INCLUDES = -I$(top_srcdir)/src/libstrongswan
 AM_CFLAGS = -rdynamic
 
-libs = $(shell find $(top_builddir)/src/libstrongswan $(top_builddir)/src/libcharon \
+libs = $(shell find $(top_builddir)/src/libstrongswan \
+                       $(top_builddir)/src/libcharon \
+                       $(top_builddir)/src/libhydra \
                        -name 'libstrongswan*.so')
 
+if USE_LIBHYDRA
+  libs += $(top_builddir)/src/libhydra/.libs/libhydra.so
+endif
+
 if USE_CHARON
   libs += $(top_builddir)/src/libcharon/.libs/libcharon.so
   libs += $(top_builddir)/src/charon/.libs/charon
@@ -34,7 +40,7 @@ if USE_TOOLS
 endif
 
 if USE_ATTR_SQL
-  libs += $(top_builddir)/src/libstrongswan/plugins/attr_sql/.libs/pool
+  libs += $(top_builddir)/src/libhydra/plugins/attr_sql/.libs/pool
 endif
 
 checksum.c : checksum_builder $(libs)
index d550bbe..a650518 100644 (file)
@@ -73,6 +73,10 @@ int main(int argc, char* argv[])
                        name = strdup("libstrongswan\",");
                        sname = strdup("library_init");
                }
+               else if (strstr(path, "libhydra.so"))
+               {
+                       name = strdup("libhydra\",");
+               }
                else if (strstr(path, "libcharon.so"))
                {
                        name = strdup("libcharon\",");