aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2010-12-06 10:36:51 +0100
committerMartin Willi <martin@revosec.ch>2011-01-05 16:45:56 +0100
commit37b3fad782faf994dfee9ba4c8af32c307c284c0 (patch)
treec8043bd7b54580d07b86a5ba220b45f7a2f7e69b
parent6ffd9f88ce4378e66f90d0bd6c08ba5dfccac55d (diff)
downloadstrongswan-37b3fad782faf994dfee9ba4c8af32c307c284c0.tar.bz2
strongswan-37b3fad782faf994dfee9ba4c8af32c307c284c0.tar.xz
Install "ipsec" script with tools or conftest
-rw-r--r--configure.in1
-rw-r--r--src/Makefile.am6
2 files changed, 6 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 7e05fb4ee..f27b0f664 100644
--- a/configure.in
+++ b/configure.in
@@ -922,6 +922,7 @@ AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$pluto = xtrue -o x$
AM_CONDITIONAL(USE_LIBHYDRA, test x$charon = xtrue -o x$pluto = xtrue)
AM_CONDITIONAL(USE_LIBCHARON, test x$charon = xtrue -o x$conftest = xtrue)
AM_CONDITIONAL(USE_FILE_CONFIG, test x$pluto = xtrue -o x$stroke = xtrue)
+AM_CONDITIONAL(USE_IPSEC_SCRIPT, test x$pluto = xtrue -o x$stroke = xtrue -o x$tools = xtrue -o x$conftest = xtrue)
AM_CONDITIONAL(USE_LIBCAP, test x$capabilities = xlibcap)
AM_CONDITIONAL(USE_VSTR, test x$vstr = xtrue)
AM_CONDITIONAL(USE_SIMAKA, test x$simaka = xtrue)
diff --git a/src/Makefile.am b/src/Makefile.am
index 2da2ab4f5..0a32ea476 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,11 @@ if USE_TLS
endif
if USE_FILE_CONFIG
- SUBDIRS += libfreeswan starter ipsec _copyright
+ SUBDIRS += libfreeswan starter
+endif
+
+if USE_IPSEC_SCRIPT
+ SUBDIRS += ipsec _copyright
endif
if USE_PLUTO