From 2cba58c5b7fe0d85647432a215f8755eb4983284 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 24 Mar 2010 11:00:11 +0100 Subject: [PATCH] Fixing integrity-checks after moving the attr-sql plugin and adding libhydra. --- src/checksum/Makefile.am | 10 ++++++++-- src/checksum/checksum_builder.c | 4 ++++ 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\",");