Imported Upstream version 5.0.1

1 files changed, 36 insertions, 29 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index caa0c5bb9..939473424 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -35,27 +35,28 @@ build_triplet = @build@
 host_triplet = @host@
 @USE_LIBSTRONGSWAN_TRUE@am__append_1 = libstrongswan
 @USE_LIBHYDRA_TRUE@am__append_2 = libhydra
-@USE_SIMAKA_TRUE@am__append_3 = libsimaka
-@USE_TLS_TRUE@am__append_4 = libtls
-@USE_RADIUS_TRUE@am__append_5 = libradius
-@USE_LIBTNCIF_TRUE@am__append_6 = libtncif
-@USE_LIBTNCCS_TRUE@am__append_7 = libtnccs
-@USE_IMCV_TRUE@am__append_8 = libimcv
-@USE_PTS_TRUE@am__append_9 = libpts
-@USE_LIBCHARON_TRUE@am__append_10 = libcharon
-@USE_FILE_CONFIG_TRUE@am__append_11 = libfreeswan starter
-@USE_IPSEC_SCRIPT_TRUE@am__append_12 = ipsec _copyright
-@USE_PLUTO_TRUE@am__append_13 = pluto whack
+@USE_LIBIPSEC_TRUE@am__append_3 = libipsec
+@USE_SIMAKA_TRUE@am__append_4 = libsimaka
+@USE_TLS_TRUE@am__append_5 = libtls
+@USE_RADIUS_TRUE@am__append_6 = libradius
+@USE_LIBTNCIF_TRUE@am__append_7 = libtncif
+@USE_LIBTNCCS_TRUE@am__append_8 = libtnccs
+@USE_IMCV_TRUE@am__append_9 = libimcv
+@USE_PTS_TRUE@am__append_10 = libpts
+@USE_LIBCHARON_TRUE@am__append_11 = libcharon
+@USE_FILE_CONFIG_TRUE@am__append_12 = starter
+@USE_IPSEC_SCRIPT_TRUE@am__append_13 = ipsec _copyright
 @USE_CHARON_TRUE@am__append_14 = charon
-@USE_STROKE_TRUE@am__append_15 = stroke
-@USE_UPDOWN_TRUE@am__append_16 = _updown _updown_espmark
-@USE_TOOLS_TRUE@am__append_17 = libfreeswan openac scepclient pki
-@USE_CONFTEST_TRUE@am__append_18 = conftest
-@USE_DUMM_TRUE@am__append_19 = dumm
-@USE_FAST_TRUE@am__append_20 = libfast
-@USE_MANAGER_TRUE@am__append_21 = manager
-@USE_MEDSRV_TRUE@am__append_22 = medsrv
-@USE_INTEGRITY_TEST_TRUE@am__append_23 = checksum
+@USE_NM_TRUE@am__append_15 = charon-nm
+@USE_STROKE_TRUE@am__append_16 = stroke
+@USE_UPDOWN_TRUE@am__append_17 = _updown _updown_espmark
+@USE_TOOLS_TRUE@am__append_18 = openac scepclient pki
+@USE_CONFTEST_TRUE@am__append_19 = conftest
+@USE_DUMM_TRUE@am__append_20 = dumm
+@USE_FAST_TRUE@am__append_21 = libfast
+@USE_MANAGER_TRUE@am__append_22 = manager
+@USE_MEDSRV_TRUE@am__append_23 = medsrv
+@USE_INTEGRITY_TEST_TRUE@am__append_24 = checksum
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -71,6 +72,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/config/libtool.m4 \
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
@@ -89,11 +91,11 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	distdir
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = . include libstrongswan libhydra libsimaka libtls \
-	libradius libtncif libtnccs libimcv libpts libcharon \
-	libfreeswan starter ipsec _copyright pluto whack charon stroke \
-	_updown _updown_espmark openac scepclient pki conftest dumm \
-	libfast manager medsrv checksum
+DIST_SUBDIRS = . include libstrongswan libhydra libipsec libsimaka \
+	libtls libradius libtncif libtnccs libimcv libpts libcharon \
+	starter ipsec _copyright charon charon-nm stroke _updown \
+	_updown_espmark openac scepclient pki conftest dumm libfast \
+	manager medsrv checksum
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -128,6 +130,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BFDLIB = @BFDLIB@
 BTLIB = @BTLIB@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -222,11 +225,14 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 c_plugins = @c_plugins@
+charon_natt_port = @charon_natt_port@
+charon_plugins = @charon_plugins@
+charon_udp_port = @charon_udp_port@
 clearsilver_LIBS = @clearsilver_LIBS@
 datadir = @datadir@
 datarootdir = @datarootdir@
 dbusservicedir = @dbusservicedir@
-default_pkcs11 = @default_pkcs11@
+dev_headers = @dev_headers@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -243,11 +249,12 @@ imcvdir = @imcvdir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+ipsec_script = @ipsec_script@
+ipsec_script_upper = @ipsec_script_upper@
 ipsecdir = @ipsecdir@
 ipsecgroup = @ipsecgroup@
 ipseclibdir = @ipseclibdir@
 ipsecuser = @ipsecuser@
-libcharon_plugins = @libcharon_plugins@
 libdir = @libdir@
 libexecdir = @libexecdir@
 linux_headers = @linux_headers@
@@ -263,6 +270,7 @@ mkdir_p = @mkdir_p@
 nm_CFLAGS = @nm_CFLAGS@
 nm_LIBS = @nm_LIBS@
 nm_ca_dir = @nm_ca_dir@
+nm_plugins = @nm_plugins@
 oldincludedir = @oldincludedir@
 openac_plugins = @openac_plugins@
 p_plugins = @p_plugins@
@@ -272,7 +280,6 @@ pdfdir = @pdfdir@
 piddir = @piddir@
 pki_plugins = @pki_plugins@
 plugindir = @plugindir@
-pluto_plugins = @pluto_plugins@
 pool_plugins = @pool_plugins@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
@@ -307,7 +314,7 @@ SUBDIRS = . include $(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_13) $(am__append_14) $(am__append_15) \
 	$(am__append_16) $(am__append_17) $(am__append_18) \
 	$(am__append_19) $(am__append_20) $(am__append_21) \
-	$(am__append_22) $(am__append_23)
+	$(am__append_22) $(am__append_23) $(am__append_24)
 EXTRA_DIST = strongswan.conf
 all: all-recursive