From: Martin Willi <martin@revosec.ch>
Date: Mon, 6 Dec 2010 09:36:51 +0000 (+0100)
Subject: Install "ipsec" script with tools or conftest
X-Git-Tag: 4.5.1~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37b3fad782faf994dfee9ba4c8af32c307c284c0;p=thirdparty%2Fstrongswan.git

Install "ipsec" script with tools or conftest
---

diff --git a/configure.in b/configure.in
index 7e05fb4ee6..f27b0f664a 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 2da2ab4f5d..0a32ea4760 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