diff options
| author | Martin Willi <martin@revosec.ch> | 2014-03-04 12:24:52 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2014-06-04 15:53:08 +0200 |
| commit | b70849ada27dae7a01bbf2059b9595a63a2d780f (patch) | |
| tree | 5fccde2f77daf59609a74f827893c367ebd5532d /configure.ac | |
| parent | 41bb8ba5d2b47ae6b7f968610fc0b56a3f00a992 (diff) | |
| download | strongswan-b70849ada27dae7a01bbf2059b9595a63a2d780f.tar.bz2 strongswan-b70849ada27dae7a01bbf2059b9595a63a2d780f.tar.xz | |
configure: Separate pki from --disable-tools
While pki builds and runs just fine on Windows, this is not true for scepclient.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 4e714237c..759e4a16a 100644 --- a/configure.ac +++ b/configure.ac @@ -265,11 +265,12 @@ ARG_ENABL_SET([manager], [enable web management console (proof of concept ARG_ENABL_SET([medcli], [enable mediation client configuration database plugin.]) ARG_ENABL_SET([medsrv], [enable mediation server web frontend and daemon plugin.]) ARG_ENABL_SET([nm], [enable NetworkManager backend.]) +ARG_DISBL_SET([pki], [disable pki certificate utility.]) ARG_DISBL_SET([scripts], [disable additional utilities (found in directory scripts).]) ARG_ENABL_SET([svc], [enable charon Windows service.]) ARG_ENABL_SET([swanctl], [enable swanctl configuration and control tool.]) ARG_ENABL_SET([tkm], [enable Trusted Key Manager support.]) -ARG_DISBL_SET([tools], [disable additional utilities (scepclient and pki).]) +ARG_DISBL_SET([tools], [disable additional utilities (scepclient).]) ARG_ENABL_SET([aikgen], [enable AIK generator.]) # optional features ARG_ENABL_SET([bfd-backtraces], [use binutils libbfd to resolve backtraces for memory leaks and segfaults.]) @@ -1421,10 +1422,11 @@ AM_CONDITIONAL(USE_THREADS, test x$threads = xtrue) AM_CONDITIONAL(USE_ADNS, test x$adns = xtrue) AM_CONDITIONAL(USE_CHARON, test x$charon = xtrue) AM_CONDITIONAL(USE_NM, test x$nm = xtrue) +AM_CONDITIONAL(USE_PKI, test x$pki = xtrue) AM_CONDITIONAL(USE_TOOLS, test x$tools = xtrue) AM_CONDITIONAL(USE_SCRIPTS, test x$scripts = xtrue) AM_CONDITIONAL(USE_CONFTEST, test x$conftest = xtrue) -AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$tls = xtrue -o x$tnc_tnccs = xtrue -o x$aikgen = xtrue -o x$svc = xtrue) +AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$pki = xtrue -o x$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$tls = xtrue -o x$tnc_tnccs = xtrue -o x$aikgen = xtrue -o x$svc = xtrue) AM_CONDITIONAL(USE_LIBHYDRA, test x$charon = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$svc = xtrue) AM_CONDITIONAL(USE_LIBCHARON, test x$charon = xtrue -o x$conftest = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$svc = xtrue) AM_CONDITIONAL(USE_LIBIPSEC, test x$libipsec = xtrue) @@ -1488,6 +1490,7 @@ 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"]) +AM_COND_IF([USE_PKI], [strongswan_options=${strongswan_options}" pki"]) AC_SUBST(strongswan_options) |