Imported Upstream version 5.5.0

1 files changed, 55 insertions, 36 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 1d012fb22..51317383f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -85,33 +95,34 @@ host_triplet = @host@
 @USE_LIBTNCIF_TRUE@am__append_6 = libtncif
 @USE_LIBTNCCS_TRUE@am__append_7 = libtnccs
 @USE_LIBPTTLS_TRUE@am__append_8 = libpttls
-@USE_IMCV_TRUE@am__append_9 = libimcv
-@USE_LIBCHARON_TRUE@am__append_10 = libcharon
-@USE_FILE_CONFIG_TRUE@am__append_11 = starter
-@USE_IPSEC_SCRIPT_TRUE@am__append_12 = ipsec _copyright
-@USE_CHARON_TRUE@am__append_13 = charon
-@USE_SYSTEMD_TRUE@am__append_14 = charon-systemd
-@USE_NM_TRUE@am__append_15 = charon-nm
-@USE_STROKE_TRUE@am__append_16 = stroke
-@USE_UPDOWN_TRUE@am__append_17 = _updown
-@USE_SCEPCLIENT_TRUE@am__append_18 = scepclient
-@USE_PKI_TRUE@am__append_19 = pki
-@USE_SWANCTL_TRUE@am__append_20 = swanctl
-@USE_CONFTEST_TRUE@am__append_21 = conftest
-@USE_DUMM_TRUE@am__append_22 = dumm
-@USE_FAST_TRUE@am__append_23 = libfast
-@USE_MANAGER_TRUE@am__append_24 = manager
-@USE_MEDSRV_TRUE@am__append_25 = medsrv
-@USE_ATTR_SQL_TRUE@am__append_26 = pool
-@USE_ATTR_SQL_FALSE@@USE_SQL_TRUE@am__append_27 = pool
-@USE_TKM_TRUE@am__append_28 = charon-tkm
-@USE_CMD_TRUE@am__append_29 = charon-cmd
-@USE_SVC_TRUE@am__append_30 = charon-svc
-@USE_LIBPTTLS_TRUE@am__append_31 = pt-tls-client
-@USE_INTEGRITY_TEST_TRUE@am__append_32 = checksum
-@USE_AIKGEN_TRUE@am__append_33 = aikgen
+@USE_LIBTPMTSS_TRUE@am__append_9 = libtpmtss
+@USE_IMCV_TRUE@am__append_10 = libimcv
+@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_SYSTEMD_TRUE@am__append_15 = charon-systemd
+@USE_NM_TRUE@am__append_16 = charon-nm
+@USE_STROKE_TRUE@am__append_17 = stroke
+@USE_UPDOWN_TRUE@am__append_18 = _updown
+@USE_SCEPCLIENT_TRUE@am__append_19 = scepclient
+@USE_PKI_TRUE@am__append_20 = pki
+@USE_SWANCTL_TRUE@am__append_21 = swanctl
+@USE_CONFTEST_TRUE@am__append_22 = conftest
+@USE_DUMM_TRUE@am__append_23 = dumm
+@USE_FAST_TRUE@am__append_24 = libfast
+@USE_MANAGER_TRUE@am__append_25 = manager
+@USE_MEDSRV_TRUE@am__append_26 = medsrv
+@USE_ATTR_SQL_TRUE@am__append_27 = pool
+@USE_ATTR_SQL_FALSE@@USE_SQL_TRUE@am__append_28 = pool
+@USE_TKM_TRUE@am__append_29 = charon-tkm
+@USE_CMD_TRUE@am__append_30 = charon-cmd
+@USE_SVC_TRUE@am__append_31 = charon-svc
+@USE_LIBPTTLS_TRUE@am__append_32 = pt-tls-client
+@USE_INTEGRITY_TEST_TRUE@am__append_33 = checksum
+@USE_AIKGEN_TRUE@am__append_34 = aikgen
+@USE_AIKPUB2_TRUE@am__append_35 = aikpub2
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/config/libtool.m4 \
 	$(top_srcdir)/m4/config/ltoptions.m4 \
@@ -125,6 +136,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/config/libtool.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -184,11 +196,12 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = . include libstrongswan libipsec libsimaka libtls \
-	libradius libtncif libtnccs libpttls libimcv libcharon starter \
-	ipsec _copyright charon charon-systemd charon-nm stroke \
-	_updown scepclient pki swanctl conftest dumm libfast manager \
-	medsrv pool charon-tkm charon-cmd charon-svc pt-tls-client \
-	checksum aikgen
+	libradius libtncif libtnccs libpttls libtpmtss libimcv \
+	libcharon starter ipsec _copyright charon charon-systemd \
+	charon-nm stroke _updown scepclient pki swanctl conftest dumm \
+	libfast manager medsrv pool charon-tkm charon-cmd charon-svc \
+	pt-tls-client checksum aikgen aikpub2
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -220,6 +233,7 @@ ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+ATOMICLIB = @ATOMICLIB@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -269,6 +283,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -303,6 +318,7 @@ PTHREADLIB = @PTHREADLIB@
 PYTHON = @PYTHON@
 PYTHONEGGINSTALLDIR = @PYTHONEGGINSTALLDIR@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PACKAGE_VERSION = @PYTHON_PACKAGE_VERSION@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
 PYTHON_VERSION = @PYTHON_VERSION@
@@ -414,6 +430,7 @@ random_device = @random_device@
 resolv_conf = @resolv_conf@
 routing_table = @routing_table@
 routing_table_prio = @routing_table_prio@
+runstatedir = @runstatedir@
 s_plugins = @s_plugins@
 sbindir = @sbindir@
 scepclient_plugins = @scepclient_plugins@
@@ -452,7 +469,8 @@ SUBDIRS = . include $(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_22) $(am__append_23) $(am__append_24) \
 	$(am__append_25) $(am__append_26) $(am__append_27) \
 	$(am__append_28) $(am__append_29) $(am__append_30) \
-	$(am__append_31) $(am__append_32) $(am__append_33)
+	$(am__append_31) $(am__append_32) $(am__append_33) \
+	$(am__append_34) $(am__append_35)
 all: all-recursive
 
 .SUFFIXES:
@@ -468,7 +486,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -763,6 +780,8 @@ uninstall-am:
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # 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.