aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2010-03-24 11:00:11 +0100
committerTobias Brunner <tobias@strongswan.org>2010-03-24 18:53:09 +0100
commit2cba58c5b7fe0d85647432a215f8755eb4983284 (patch)
tree05152da9a49dca7253e7fef7686b018fa7ec297c /src
parent75dc019252b43e9e7d625b099b75aff8f9b2f282 (diff)
downloadstrongswan-2cba58c5b7fe0d85647432a215f8755eb4983284.tar.bz2
strongswan-2cba58c5b7fe0d85647432a215f8755eb4983284.tar.xz
Fixing integrity-checks after moving the attr-sql plugin and adding libhydra.
Diffstat (limited to 'src')
-rw-r--r--src/checksum/Makefile.am10
-rw-r--r--src/checksum/checksum_builder.c4
2 files changed, 12 insertions, 2 deletions
diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am
index 8c27d7dbf..ed87e624e 100644
--- a/src/checksum/Makefile.am
+++ b/src/checksum/Makefile.am
@@ -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)
diff --git a/src/checksum/checksum_builder.c b/src/checksum/checksum_builder.c
index d550bbeb0..a650518fd 100644
--- a/src/checksum/checksum_builder.c
+++ b/src/checksum/checksum_builder.c
@@ -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\",");