diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2011-06-08 15:46:07 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2011-06-08 15:46:07 +0200 |
| commit | 289c4245899f2771cfce7ab3233a01cbe9f97c94 (patch) | |
| tree | 6ab8b76141727f76c5d72a95e67e274196852bb3 /src | |
| parent | dcc1ad6a23893d3e228071a306d677403509c9ea (diff) | |
| download | strongswan-289c4245899f2771cfce7ab3233a01cbe9f97c94.tar.bz2 strongswan-289c4245899f2771cfce7ab3233a01cbe9f97c94.tar.xz | |
Fix integrity checks with monolithic build.
Diffstat (limited to 'src')
| -rw-r--r-- | src/checksum/Makefile.am | 11 | ||||
| -rw-r--r-- | src/checksum/checksum_builder.c | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am index 4d0f6bf7f..600e72557 100644 --- a/src/checksum/Makefile.am +++ b/src/checksum/Makefile.am @@ -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 diff --git a/src/checksum/checksum_builder.c b/src/checksum/checksum_builder.c index 3bfff3ac4..a4d9aa084 100644 --- a/src/checksum/checksum_builder.c +++ b/src/checksum/checksum_builder.c @@ -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 |