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

use sysconfdir, no need for an additional confdir variable

Browse Source
This commit is contained in:
Martin Willi
2009-09-07 15:10:30 +02:00
parent c0e56a663e
commit faa4bd49fb
8 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.in
-1
View File
@@ -19,7 +19,6 @@ dnl ===========================
AC_INIT(strongSwan,4.3.5) AC_INIT(strongSwan,4.3.5)
AM_INIT_AUTOMAKE(tar-ustar) AM_INIT_AUTOMAKE(tar-ustar)
AC_CONFIG_MACRO_DIR([m4/config]) AC_CONFIG_MACRO_DIR([m4/config])
AC_SUBST(confdir, '${sysconfdir}')
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
dnl ================================= dnl =================================
src/charon/plugins/eap_sim/Makefile.am
+1 -1
View File
@@ -2,7 +2,7 @@
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_CONFDIR=\"${confdir}\" \ -DIPSEC_CONFDIR=\"${sysconfdir}\" \
-DSIM_READER_LIB=\"${sim_reader}\" -DSIM_READER_LIB=\"${sim_reader}\"
plugin_LTLIBRARIES = libstrongswan-eapsim.la plugin_LTLIBRARIES = libstrongswan-eapsim.la
src/charon/plugins/eap_sim_file/Makefile.am
+1 -1
View File
@@ -1,7 +1,7 @@
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 -DIPSEC_CONFDIR=\"${confdir}\" AM_CFLAGS = -rdynamic -DIPSEC_CONFDIR=\"${sysconfdir}\"
plugin_LTLIBRARIES = libstrongswan-eapsim-file.la plugin_LTLIBRARIES = libstrongswan-eapsim-file.la
src/charon/plugins/stroke/Makefile.am
+1 -1
View File
@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon -I$(top_
AM_CFLAGS = \ AM_CFLAGS = \
-rdynamic \ -rdynamic \
-DIPSEC_CONFDIR=\"${confdir}\" \ -DIPSEC_CONFDIR=\"${sysconfdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PIDDIR=\"${piddir}\"
plugin_LTLIBRARIES = libstrongswan-stroke.la plugin_LTLIBRARIES = libstrongswan-stroke.la
src/openac/Makefile.am
+1 -1
View File
@@ -4,7 +4,7 @@ dist_man_MANS = openac.8
INCLUDES = -I$(top_srcdir)/src/libstrongswan INCLUDES = -I$(top_srcdir)/src/libstrongswan
AM_CFLAGS = \ AM_CFLAGS = \
-DIPSEC_CONFDIR=\"${confdir}\" \ -DIPSEC_CONFDIR=\"${sysconfdir}\" \
-DSTRONGSWAN_CONF=\"${strongswan_conf}\" \ -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
-DIPSEC_PLUGINDIR=\"${plugindir}\" \ -DIPSEC_PLUGINDIR=\"${plugindir}\" \
-DPLUGINS=\""${libstrongswan_plugins}\"" -DPLUGINS=\""${libstrongswan_plugins}\""
src/pluto/Makefile.am
+1 -1
View File
@@ -65,7 +65,7 @@ INCLUDES = \
AM_CFLAGS = \ AM_CFLAGS = \
-DIPSEC_DIR=\"${ipsecdir}\" \ -DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_CONFDIR=\"${confdir}\" \ -DIPSEC_CONFDIR=\"${sysconfdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" \ -DIPSEC_PIDDIR=\"${piddir}\" \
-DSHARED_SECRETS_FILE=\"${confdir}/ipsec.secrets\" \ -DSHARED_SECRETS_FILE=\"${confdir}/ipsec.secrets\" \
-DIPSEC_PLUGINDIR=\"${plugindir}\" \ -DIPSEC_PLUGINDIR=\"${plugindir}\" \
src/scepclient/Makefile.am
+1 -1
View File
@@ -16,7 +16,7 @@ INCLUDES = \
-I$(WHACKDIR) -I$(WHACKDIR)
AM_CFLAGS = \ AM_CFLAGS = \
-DIPSEC_CONFDIR=\"${confdir}\" \ -DIPSEC_CONFDIR=\"${sysconfdir}\" \
-DIPSEC_PLUGINDIR=\"${plugindir}\" \ -DIPSEC_PLUGINDIR=\"${plugindir}\" \
-DPLUGINS=\""${pluto_plugins}\"" \ -DPLUGINS=\""${pluto_plugins}\"" \
-DSTRONGSWAN_CONF=\"${strongswan_conf}\" \ -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
src/starter/Makefile.am
+1 -1
View File
@@ -15,7 +15,7 @@ INCLUDES = \
AM_CFLAGS = \ AM_CFLAGS = \
-DIPSEC_DIR=\"${ipsecdir}\" \ -DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_CONFDIR=\"${confdir}\" \ -DIPSEC_CONFDIR=\"${sysconfdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" \ -DIPSEC_PIDDIR=\"${piddir}\" \
-DIPSEC_EAPDIR=\"${eapdir}\" \ -DIPSEC_EAPDIR=\"${eapdir}\" \
-DDEV_RANDOM=\"${random_device}\" \ -DDEV_RANDOM=\"${random_device}\" \