conf: Only install config snippets for enabled components
This commit is contained in:
+3
-2
@@ -89,8 +89,9 @@ confsnippets = $(alloptions:opt=conf)
|
|||||||
# we only install snippets for enabled plugins
|
# we only install snippets for enabled plugins
|
||||||
plugins_install_tmp = $(charon_plugins:%=plugins/%.tmp)
|
plugins_install_tmp = $(charon_plugins:%=plugins/%.tmp)
|
||||||
plugins_install_src = $(charon_plugins:%=plugins/%.conf)
|
plugins_install_src = $(charon_plugins:%=plugins/%.conf)
|
||||||
|
# only install snippets for enabled components
|
||||||
options_install_src = $(options:opt=conf)
|
# has to be defined via autoconf as we can't do it with automake conditionals
|
||||||
|
options_install_src = $(strongswan_options:%=options/%.conf)
|
||||||
|
|
||||||
templates_DATA = strongswan.conf
|
templates_DATA = strongswan.conf
|
||||||
optionstemplate_DATA = $(options_install_src)
|
optionstemplate_DATA = $(options_install_src)
|
||||||
|
|||||||
+20
-1
@@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Copyright (C) 2007-2013 Tobias Brunner
|
# Copyright (C) 2007-2014 Tobias Brunner
|
||||||
# Copyright (C) 2006-2013 Andreas Steffen
|
# Copyright (C) 2006-2013 Andreas Steffen
|
||||||
# Copyright (C) 2006-2013 Martin Willi
|
# Copyright (C) 2006-2013 Martin Willi
|
||||||
# Hochschule fuer Technik Rapperswil
|
# Hochschule fuer Technik Rapperswil
|
||||||
@@ -1363,6 +1363,25 @@ if test x$ikev2 = xtrue; then
|
|||||||
AC_DEFINE([USE_IKEV2], [], [support for IKEv2 protocol])
|
AC_DEFINE([USE_IKEV2], [], [support for IKEv2 protocol])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# ====================================================
|
||||||
|
# options for enabled modules (see conf/Makefile.am)
|
||||||
|
# ====================================================
|
||||||
|
|
||||||
|
strongswan_options=
|
||||||
|
|
||||||
|
AM_COND_IF([USE_ATTR_SQL], [strongswan_options=${strongswan_options}" pool"])
|
||||||
|
AM_COND_IF([USE_CHARON], [strongswan_options=${strongswan_options}" charon charon-logging"])
|
||||||
|
AM_COND_IF([USE_FILE_CONFIG], [strongswan_options=${strongswan_options}" starter"])
|
||||||
|
AM_COND_IF([USE_IMV_ATTESTATION], [strongswan_options=${strongswan_options}" attest"])
|
||||||
|
AM_COND_IF([USE_IMCV], [strongswan_options=${strongswan_options}" imcv"])
|
||||||
|
AM_COND_IF([USE_IMV_OS], [strongswan_options=${strongswan_options}" pacman"])
|
||||||
|
AM_COND_IF([USE_LIBTNCCS], [strongswan_options=${strongswan_options}" tnc"])
|
||||||
|
AM_COND_IF([USE_MANAGER], [strongswan_options=${strongswan_options}" manager"])
|
||||||
|
AM_COND_IF([USE_MEDSRV], [strongswan_options=${strongswan_options}" medsrv"])
|
||||||
|
AM_COND_IF([USE_TOOLS], [strongswan_options=${strongswan_options}" tools"])
|
||||||
|
|
||||||
|
AC_SUBST(strongswan_options)
|
||||||
|
|
||||||
# =================
|
# =================
|
||||||
# build Makefiles
|
# build Makefiles
|
||||||
# =================
|
# =================
|
||||||
|
|||||||
Reference in New Issue
Block a user