ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

Fix integrity checks with monolithic build.

This commit is contained in:
Tobias Brunner 2011-06-08 15:46:07 +02:00
parent dcc1ad6a23
commit 289c424589
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/checksum/Makefile.am
View File

@ -15,21 +15,28 @@ BUILT_SOURCES = checksum.c
CLEANFILES = checksum.c CLEANFILES = checksum.c
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic \ AM_CFLAGS = -rdynamic
-DS_PLUGINS=\""${s_plugins}\"" -DS_PATH=\""${top_builddir}/src/libstrongswan/plugins\""
libs = $(top_builddir)/src/libstrongswan/.libs/libstrongswan.so 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 if USE_LIBHYDRA
libs += $(top_builddir)/src/libhydra/.libs/libhydra.so libs += $(top_builddir)/src/libhydra/.libs/libhydra.so
if !MONOLITHIC
AM_CFLAGS += -DH_PLUGINS=\""${h_plugins}\"" -DH_PATH=\""${top_builddir}/src/libhydra/plugins\"" AM_CFLAGS += -DH_PLUGINS=\""${h_plugins}\"" -DH_PATH=\""${top_builddir}/src/libhydra/plugins\""
endif endif
endif
if USE_CHARON if USE_CHARON
libs += $(top_builddir)/src/libcharon/.libs/libcharon.so libs += $(top_builddir)/src/libcharon/.libs/libcharon.so
libs += $(top_builddir)/src/charon/.libs/charon libs += $(top_builddir)/src/charon/.libs/charon
if !MONOLITHIC
AM_CFLAGS += -DC_PLUGINS=\""${c_plugins}\"" -DC_PATH=\""${top_builddir}/src/libcharon/plugins\"" AM_CFLAGS += -DC_PLUGINS=\""${c_plugins}\"" -DC_PATH=\""${top_builddir}/src/libcharon/plugins\""
endif endif
endif
if USE_PLUTO if USE_PLUTO
libs += $(top_builddir)/src/pluto/.libs/pluto libs += $(top_builddir)/src/pluto/.libs/pluto

2
src/checksum/checksum_builder.c
View File

@ -155,7 +155,9 @@ int main(int argc, char* argv[])
{ {
build_binary_checksum(argv[i]); build_binary_checksum(argv[i]);
} }
#ifdef S_PLUGINS
build_plugin_checksums(S_PLUGINS, S_PATH); build_plugin_checksums(S_PLUGINS, S_PATH);
#endif
#ifdef H_PLUGINS #ifdef H_PLUGINS
build_plugin_checksums(H_PLUGINS, H_PATH); build_plugin_checksums(H_PLUGINS, H_PATH);
#endif #endif