Fix integrity checks with monolithic build.
authorTobias Brunner <tobias@strongswan.org>
Wed, 8 Jun 2011 13:46:07 +0000 (15:46 +0200)
committerTobias Brunner <tobias@strongswan.org>
Wed, 8 Jun 2011 13:46:07 +0000 (15:46 +0200)
src/checksum/Makefile.am
src/checksum/checksum_builder.c

index 4d0f6bf..600e725 100644 (file)
@@ -15,21 +15,28 @@ BUILT_SOURCES = checksum.c
 CLEANFILES = checksum.c
 INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
-AM_CFLAGS = -rdynamic \
-       -DS_PLUGINS=\""${s_plugins}\"" -DS_PATH=\""${top_builddir}/src/libstrongswan/plugins\""
+AM_CFLAGS = -rdynamic
 
 libs = $(top_builddir)/src/libstrongswan/.libs/libstrongswan.so
 
+if !MONOLITHIC
+  AM_CFLAGS += -DS_PLUGINS=\""${s_plugins}\"" -DS_PATH=\""${top_builddir}/src/libstrongswan/plugins\""
+endif
+
 if USE_LIBHYDRA
   libs += $(top_builddir)/src/libhydra/.libs/libhydra.so
+if !MONOLITHIC
   AM_CFLAGS += -DH_PLUGINS=\""${h_plugins}\"" -DH_PATH=\""${top_builddir}/src/libhydra/plugins\""
 endif
+endif
 
 if USE_CHARON
   libs += $(top_builddir)/src/libcharon/.libs/libcharon.so
   libs += $(top_builddir)/src/charon/.libs/charon
+if !MONOLITHIC
   AM_CFLAGS += -DC_PLUGINS=\""${c_plugins}\"" -DC_PATH=\""${top_builddir}/src/libcharon/plugins\""
 endif
+endif
 
 if USE_PLUTO
   libs += $(top_builddir)/src/pluto/.libs/pluto
index 3bfff3a..a4d9aa0 100644 (file)
@@ -155,7 +155,9 @@ int main(int argc, char* argv[])
        {
                build_binary_checksum(argv[i]);
        }
+#ifdef S_PLUGINS
        build_plugin_checksums(S_PLUGINS, S_PATH);
+#endif
 #ifdef H_PLUGINS
        build_plugin_checksums(H_PLUGINS, H_PATH);
 #endif