[svn-upgrade] Integrating new upstream version, strongswan (4.1.10)

1 files changed, 36 insertions, 17 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index aea3c7a2b..f2e6dcefe 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -31,8 +31,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@USE_UML_TRUE@am__append_1 = dumm
-@USE_MANAGER_TRUE@am__append_2 = manager
+@USE_FILE_CONFIG_TRUE@am__append_1 = libfreeswan starter ipsec _copyright
+@USE_LIBSTRONGSWAN_TRUE@am__append_2 = libstrongswan
+@USE_PLUTO_TRUE@am__append_3 = libcrypto pluto whack
+@USE_CHARON_TRUE@am__append_4 = charon
+@USE_STROKE_TRUE@am__append_5 = stroke
+@USE_PLUTO_OR_CHARON_TRUE@am__append_6 = _updown _updown_espmark
+@USE_TOOLS_TRUE@am__append_7 = openac scepclient
+@USE_UML_TRUE@am__append_8 = dumm
+@USE_MANAGER_TRUE@am__append_9 = manager
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -54,9 +61,9 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = include libfreeswan libcrypto libstrongswan pluto whack \
-	charon stroke starter openac scepclient ipsec _updown \
-	_updown_espmark _copyright dumm manager
+DIST_SUBDIRS = include libfreeswan starter ipsec _copyright \
+	libstrongswan libcrypto pluto whack charon stroke _updown \
+	_updown_espmark openac scepclient dumm manager
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -188,9 +195,9 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xml_CFLAGS = @xml_CFLAGS@
 xml_LIBS = @xml_LIBS@
-SUBDIRS = include libfreeswan libcrypto libstrongswan pluto whack \
-	charon stroke starter openac scepclient ipsec _updown \
-	_updown_espmark _copyright $(am__append_1) $(am__append_2)
+SUBDIRS = include $(am__append_1) $(am__append_2) $(am__append_3) \
+	$(am__append_4) $(am__append_5) $(am__append_6) \
+	$(am__append_7) $(am__append_8) $(am__append_9)
 all: all-recursive
 
 .SUFFIXES:
@@ -433,6 +440,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+@USE_FILE_CONFIG_FALSE@install-exec-local:
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -455,7 +463,7 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
-install-exec-am:
+install-exec-am: install-exec-local
 
 install-html: install-html-recursive
 
@@ -496,14 +504,25 @@ uninstall-am:
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
-
+	install-exec-am install-exec-local install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am
+
+
+@USE_FILE_CONFIG_TRUE@install-exec-local :
+@USE_FILE_CONFIG_TRUE@	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d
+@USE_FILE_CONFIG_TRUE@	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/cacerts
+@USE_FILE_CONFIG_TRUE@	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/ocspcerts
+@USE_FILE_CONFIG_TRUE@	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/certs
+@USE_FILE_CONFIG_TRUE@	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/acerts
+@USE_FILE_CONFIG_TRUE@	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/aacerts
+@USE_FILE_CONFIG_TRUE@	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/crls
+@USE_FILE_CONFIG_TRUE@	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/reqs
+@USE_FILE_CONFIG_TRUE@	mkdir -p -m 700 $(DESTDIR)$(confdir)/ipsec.d/private
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: