denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed the strongswan.conf path

Browse Source
This commit is contained in:
Andreas Steffen
2008-05-22 21:59:30 +00:00
parent 7199d22e77
commit eaa1399812
5 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/Makefile.am
+6 -2
View File
@@ -94,8 +94,12 @@ credentials/sets/cert_cache.c credentials/sets/cert_cache.h \
credentials/credential_set.h credentials/credential_set.h
INCLUDES = -I${linuxdir} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon INCLUDES = -I${linuxdir} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
AM_CFLAGS = -rdynamic -DIPSEC_DIR=\"${ipsecdir}\" \ AM_CFLAGS = -rdynamic \
-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PLUGINDIR=\"${plugindir}\" -DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" \
-DIPSEC_PLUGINDIR=\"${plugindir}\" \
-DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
-DRESOLV_CONF=\"${resolv_conf}\"
charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lpthread -lm -ldl charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lpthread -lm -ldl
# compile options # compile options
src/charon/plugins/sql/Makefile.am
+3 -1
View File
@@ -2,7 +2,9 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
AM_CFLAGS = -rdynamic \ AM_CFLAGS = -rdynamic \
-DIPSEC_PLUGINDIR=\"${plugindir}\" -DPLUGINS=\""${libstrongswan_plugins}\"" -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
-DIPSEC_PLUGINDIR=\"${plugindir}\" \
-DPLUGINS=\""${libstrongswan_plugins}\""
plugin_LTLIBRARIES = libstrongswan-sql.la plugin_LTLIBRARIES = libstrongswan-sql.la
libstrongswan_sql_la_SOURCES = sql_plugin.h sql_plugin.c \ libstrongswan_sql_la_SOURCES = sql_plugin.h sql_plugin.c \
src/libstrongswan/Makefile.am
+6 -7
View File
@@ -157,14 +157,13 @@ if USE_OPENSSL
endif endif
if USE_INTEGRITY_TEST if USE_INTEGRITY_TEST
# build fips_signer which in turn builds fips_signature.h noinst_PROGRAMS = fips_signer
######################################################### fips_signer_SOURCES = fips/fips_signer.c
noinst_PROGRAMS = fips_signer fips_signer_LDADD = libstrongswan.la
fips_signer_SOURCES = fips/fips_signer.c
fips_signer_LDADD = libstrongswan.la
BUILT_SOURCES += fips_signature.h BUILT_SOURCES += fips_signature.h
CLEANFILES = fips_signature.h fips_signer CLEANFILES = fips_signature.h fips_signer
AM_CFLAGS += -DSTRONGSWAN_CONF=\"${strongswan_conf}\"
fips_signature.h : fips_signer fips_signature.h : fips_signer
./fips_signer ./fips_signer
src/manager/Makefile.am
+6 -2
View File
@@ -13,8 +13,12 @@ controller/gateway_controller.c controller/gateway_controller.h
manager_fcgi_LDADD = $(top_builddir)/src/libfast/libfast.la ${xml_LIBS} manager_fcgi_LDADD = $(top_builddir)/src/libfast/libfast.la ${xml_LIBS}
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libfast ${xml_CFLAGS} INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libfast ${xml_CFLAGS}
AM_CFLAGS = -rdynamic -DIPSECDIR=\"${ipsecdir}\" -DIPSEC_PIDDIR=\"${piddir}\" \ AM_CFLAGS = -rdynamic \
-DIPSEC_PLUGINDIR=\"${plugindir}\" -DPLUGINS=\""${libstrongswan_plugins}\"" -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
-DIPSECDIR=\"${ipsecdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" \
-DIPSEC_PLUGINDIR=\"${plugindir}\"\
-DPLUGINS=\""${libstrongswan_plugins}\""
# Don't forget to add templates to EXTRA_DIST !!! How to automate? # Don't forget to add templates to EXTRA_DIST !!! How to automate?
manager_templatesdir = ${managerdir}/templates manager_templatesdir = ${managerdir}/templates
src/openac/Makefile.am
+5 -2
View File
@@ -3,7 +3,10 @@ openac_SOURCES = openac.c
dist_man_MANS = openac.8 dist_man_MANS = openac.8
INCLUDES = -I$(top_srcdir)/src/libstrongswan INCLUDES = -I$(top_srcdir)/src/libstrongswan
AM_CFLAGS = -DIPSEC_CONFDIR=\"${confdir}\" \ AM_CFLAGS = \
-DIPSEC_PLUGINDIR=\"${plugindir}\" -DPLUGINS=\""${libstrongswan_plugins}\"" -DIPSEC_CONFDIR=\"${confdir}\" \
-DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
-DIPSEC_PLUGINDIR=\"${plugindir}\" \
-DPLUGINS=\""${libstrongswan_plugins}\""
openac_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lgmp openac_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lgmp