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

1 files changed, 455 insertions, 172 deletions

diff --git a/configure b/configure
index c79322bc3..575ea96fb 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for strongSwan 4.1.4.
+# Generated by GNU Autoconf 2.61 for strongSwan 4.1.8.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='strongSwan'
 PACKAGE_TARNAME='strongswan'
-PACKAGE_VERSION='4.1.4'
-PACKAGE_STRING='strongSwan 4.1.4'
+PACKAGE_VERSION='4.1.8'
+PACKAGE_STRING='strongSwan 4.1.8'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -806,6 +806,7 @@ target_alias
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
+am__isrc
 CYGPATH_W
 PACKAGE
 VERSION
@@ -851,6 +852,8 @@ backenddir
 interfacedir
 linuxdir
 LINUX_HEADERS
+IPSEC_ROUTING_TABLE
+IPSEC_ROUTING_TABLE_PRIO
 ipsecuid
 ipsecgid
 USE_LIBCURL_TRUE
@@ -861,6 +864,8 @@ USE_LIBDBUS_TRUE
 USE_LIBDBUS_FALSE
 USE_LIBXML_TRUE
 USE_LIBXML_FALSE
+USE_LIBSQLITE_TRUE
+USE_LIBSQLITE_FALSE
 USE_SMARTCARD_TRUE
 USE_SMARTCARD_FALSE
 USE_CISCO_QUIRKS_TRUE
@@ -873,6 +878,18 @@ USE_NAT_TRANSPORT_TRUE
 USE_NAT_TRANSPORT_FALSE
 USE_VENDORID_TRUE
 USE_VENDORID_FALSE
+USE_XAUTH_VID_TRUE
+USE_XAUTH_VID_FALSE
+USE_UML_TRUE
+USE_UML_FALSE
+USE_MANAGER_TRUE
+USE_MANAGER_FALSE
+USE_P2P_TRUE
+USE_P2P_FALSE
+USE_INTEGRITY_TEST_TRUE
+USE_INTEGRITY_TEST_FALSE
+USE_SELF_TEST_TRUE
+USE_SELF_TEST_FALSE
 build
 build_cpu
 build_vendor
@@ -905,10 +922,10 @@ YFLAGS
 GPERF
 PERL
 PKG_CONFIG
-dbus_CFLAGS
-dbus_LIBS
 xml_CFLAGS
 xml_LIBS
+dbus_CFLAGS
+dbus_LIBS
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -930,10 +947,10 @@ FFLAGS
 YACC
 YFLAGS
 PKG_CONFIG
-dbus_CFLAGS
-dbus_LIBS
 xml_CFLAGS
-xml_LIBS'
+xml_LIBS
+dbus_CFLAGS
+dbus_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1436,7 +1453,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures strongSwan 4.1.4 to adapt to many kinds of systems.
+\`configure' configures strongSwan 4.1.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1506,7 +1523,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of strongSwan 4.1.4:";;
+     short | recursive ) echo "Configuration of strongSwan 4.1.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1523,6 +1540,8 @@ Optional Features:
                           (default is NO). Requires libdbus.
   --enable-xml            enable XML configuration and control interface
                           (default is NO). Requires libxml.
+  --enable-sqlite         enable SQLite configuration backend (default is NO).
+                          Requires libsqlite3.
   --enable-smartcard      enable smartcard support (default is NO).
   --enable-cisco-quirks   enable support of Cisco VPN client (default is NO).
   --enable-leak-detective enable malloc hooks to find memory leaks (default is
@@ -1533,6 +1552,15 @@ Optional Features:
                           (default is NO).
   --disable-vendor-id     disable the sending of the strongSwan vendor ID
                           (default is NO).
+  --disable-xauth-vid     disable the sending of the XAUTH vendor ID (default
+                          is NO).
+  --enable-uml            build the UML test framework (default is NO).
+  --enable-manager        build web management console (default is NO).
+  --enable-p2p            enable peer-to-peer NAT traversal (default is NO).
+  --enable-integrity-test enable the integrity test of the crypto library
+                          (default is NO).
+  --disable-self-test     disable the self-test of the crypto library (default
+                          is NO).
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1570,6 +1598,10 @@ Optional Packages:
   --with-linux-headers=dir
                           use the linux header files in dir instead of the
                           supplied ones in "src/include"
+  --with-routing-table=num
+                          use routing table for IPsec routes (default: 220)
+  --with-routing-table-prio=prio
+                          priority for IPsec routing table (default: 220)
   --with-uid=uid          change user of the daemons to UID after startup
                           (default is 0).
   --with-gid=gid          change group of the daemons to GID after startup
@@ -1599,10 +1631,10 @@ Some influential environment variables:
               This script will default YFLAGS to the empty string to avoid a
               default value of `-d' given by some make applications.
   PKG_CONFIG  path to pkg-config utility
-  dbus_CFLAGS C compiler flags for dbus, overriding pkg-config
-  dbus_LIBS   linker flags for dbus, overriding pkg-config
   xml_CFLAGS  C compiler flags for xml, overriding pkg-config
   xml_LIBS    linker flags for xml, overriding pkg-config
+  dbus_CFLAGS C compiler flags for dbus, overriding pkg-config
+  dbus_LIBS   linker flags for dbus, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1667,7 +1699,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-strongSwan configure 4.1.4
+strongSwan configure 4.1.8
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1681,7 +1713,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by strongSwan $as_me 4.1.4, which was
+It was created by strongSwan $as_me 4.1.8, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2034,7 +2066,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-am__api_version="1.9"
+am__api_version='1.10'
+
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
@@ -2217,38 +2250,53 @@ else
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
   else
-    mkdir_p='$(install_sh) -d'
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
   fi
 fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 
 for ac_prog in gawk mawk nawk awk
 do
@@ -2331,12 +2379,16 @@ else
 fi
 rmdir .tst 2>/dev/null
 
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 fi
 
 # test whether we have cygpath
@@ -2351,7 +2403,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='strongswan'
- VERSION='4.1.4'
+ VERSION='4.1.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2379,7 +2431,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -2483,7 +2535,7 @@ else
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -2631,9 +2683,7 @@ if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -2642,7 +2692,6 @@ else
 fi
 
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3629,6 +3678,7 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3658,9 +3708,7 @@ fi
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -4707,6 +4755,42 @@ fi
 
 
 
+# Check whether --with-routing-table was given.
+if test "${with_routing_table+set}" = set; then
+  withval=$with_routing_table; cat >>confdefs.h <<_ACEOF
+#define IPSEC_ROUTING_TABLE $withval
+_ACEOF
+ IPSEC_ROUTING_TABLE="$withval"
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define IPSEC_ROUTING_TABLE 220
+_ACEOF
+ IPSEC_ROUTING_TABLE="220"
+
+
+fi
+
+
+
+# Check whether --with-routing-table-prio was given.
+if test "${with_routing_table_prio+set}" = set; then
+  withval=$with_routing_table_prio; cat >>confdefs.h <<_ACEOF
+#define IPSEC_ROUTING_TABLE_PRIO $withval
+_ACEOF
+ IPSEC_ROUTING_TABLE_PRIO="$withval"
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define IPSEC_ROUTING_TABLE_PRIO 220
+_ACEOF
+ IPSEC_ROUTING_TABLE_PRIO="220"
+
+
+fi
+
+
+
 # Check whether --with-uid was given.
 if test "${with_uid+set}" = set; then
   withval=$with_uid; cat >>confdefs.h <<_ACEOF
@@ -4754,9 +4838,7 @@ _ACEOF
 
 fi
 
-
-
-if test x$http = xtrue; then
+ if test x$http = xtrue; then
   USE_LIBCURL_TRUE=
   USE_LIBCURL_FALSE='#'
 else
@@ -4777,9 +4859,7 @@ _ACEOF
 
 fi
 
-
-
-if test x$ldap = xtrue; then
+ if test x$ldap = xtrue; then
   USE_LIBLDAP_TRUE=
   USE_LIBLDAP_FALSE='#'
 else
@@ -4800,9 +4880,7 @@ _ACEOF
 
 fi
 
-
-
-if test x$dbus = xtrue; then
+ if test x$dbus = xtrue; then
   USE_LIBDBUS_TRUE=
   USE_LIBDBUS_FALSE='#'
 else
@@ -4823,9 +4901,7 @@ _ACEOF
 
 fi
 
-
-
-if test x$xml = xtrue; then
+ if test x$xml = xtrue; then
   USE_LIBXML_TRUE=
   USE_LIBXML_FALSE='#'
 else
@@ -4834,6 +4910,27 @@ else
 fi
 
 
+# Check whether --enable-sqlite was given.
+if test "${enable_sqlite+set}" = set; then
+  enableval=$enable_sqlite; if test x$enableval = xyes; then
+        sqlite=true
+        cat >>confdefs.h <<\_ACEOF
+#define LIBSQLITE 1
+_ACEOF
+
+    fi
+
+fi
+
+ if test x$sqlite = xtrue; then
+  USE_LIBSQLITE_TRUE=
+  USE_LIBSQLITE_FALSE='#'
+else
+  USE_LIBSQLITE_TRUE='#'
+  USE_LIBSQLITE_FALSE=
+fi
+
+
 # Check whether --enable-smartcard was given.
 if test "${enable_smartcard+set}" = set; then
   enableval=$enable_smartcard; if test x$enableval = xyes; then
@@ -4846,9 +4943,7 @@ _ACEOF
 
 fi
 
-
-
-if test x$smartcard = xtrue; then
+ if test x$smartcard = xtrue; then
   USE_SMARTCARD_TRUE=
   USE_SMARTCARD_FALSE='#'
 else
@@ -4865,9 +4960,7 @@ if test "${enable_cisco_quirks+set}" = set; then
 
 fi
 
-
-
-if test x$cisco_quirks = xtrue; then
+ if test x$cisco_quirks = xtrue; then
   USE_CISCO_QUIRKS_TRUE=
   USE_CISCO_QUIRKS_FALSE='#'
 else
@@ -4884,9 +4977,7 @@ if test "${enable_leak_detective+set}" = set; then
 
 fi
 
-
-
-if test x$leak_detective = xtrue; then
+ if test x$leak_detective = xtrue; then
   USE_LEAK_DETECTIVE_TRUE=
   USE_LEAK_DETECTIVE_FALSE='#'
 else
@@ -4903,9 +4994,7 @@ if test "${enable_eap_sim+set}" = set; then
 
 fi
 
-
-
-if test x$eap_sim = xtrue; then
+ if test x$eap_sim = xtrue; then
   BUILD_EAP_SIM_TRUE=
   BUILD_EAP_SIM_FALSE='#'
 else
@@ -4922,9 +5011,7 @@ if test "${enable_nat_transport+set}" = set; then
 
 fi
 
-
-
-if test x$nat_transport = xtrue; then
+ if test x$nat_transport = xtrue; then
   USE_NAT_TRANSPORT_TRUE=
   USE_NAT_TRANSPORT_FALSE='#'
 else
@@ -4945,9 +5032,7 @@ else
 
 fi
 
-
-
-if test x$vendor_id = xtrue; then
+ if test x$vendor_id = xtrue; then
   USE_VENDORID_TRUE=
   USE_VENDORID_FALSE='#'
 else
@@ -4956,6 +5041,128 @@ else
 fi
 
 
+# Check whether --enable-xauth-vid was given.
+if test "${enable_xauth_vid+set}" = set; then
+  enableval=$enable_xauth_vid; if test x$enableval = xyes; then
+        xauth_vid=true
+     else
+        xauth_vid=false
+    fi
+else
+  xauth_vid=true
+
+fi
+
+ if test x$xauth_vid = xtrue; then
+  USE_XAUTH_VID_TRUE=
+  USE_XAUTH_VID_FALSE='#'
+else
+  USE_XAUTH_VID_TRUE='#'
+  USE_XAUTH_VID_FALSE=
+fi
+
+
+# Check whether --enable-uml was given.
+if test "${enable_uml+set}" = set; then
+  enableval=$enable_uml; if test x$enableval = xyes; then
+        uml=true
+    fi
+
+fi
+
+ if test x$uml = xtrue; then
+  USE_UML_TRUE=
+  USE_UML_FALSE='#'
+else
+  USE_UML_TRUE='#'
+  USE_UML_FALSE=
+fi
+
+
+# Check whether --enable-manager was given.
+if test "${enable_manager+set}" = set; then
+  enableval=$enable_manager; if test x$enableval = xyes; then
+        manager=true
+    fi
+
+fi
+
+ if test x$manager = xtrue; then
+  USE_MANAGER_TRUE=
+  USE_MANAGER_FALSE='#'
+else
+  USE_MANAGER_TRUE='#'
+  USE_MANAGER_FALSE=
+fi
+
+
+# Check whether --enable-p2p was given.
+if test "${enable_p2p+set}" = set; then
+  enableval=$enable_p2p; if test x$enableval = xyes; then
+        p2p=true
+        cat >>confdefs.h <<\_ACEOF
+#define P2P 1
+_ACEOF
+
+    fi
+
+fi
+
+ if test x$p2p = xtrue; then
+  USE_P2P_TRUE=
+  USE_P2P_FALSE='#'
+else
+  USE_P2P_TRUE='#'
+  USE_P2P_FALSE=
+fi
+
+
+# Check whether --enable-integrity-test was given.
+if test "${enable_integrity_test+set}" = set; then
+  enableval=$enable_integrity_test; if test x$enableval = xyes; then
+        integrity_test=true
+        cat >>confdefs.h <<\_ACEOF
+#define INTEGRITY_TEST 1
+_ACEOF
+
+     fi
+
+fi
+
+ if test x$integrity_test = xtrue; then
+  USE_INTEGRITY_TEST_TRUE=
+  USE_INTEGRITY_TEST_FALSE='#'
+else
+  USE_INTEGRITY_TEST_TRUE='#'
+  USE_INTEGRITY_TEST_FALSE=
+fi
+
+
+# Check whether --enable-self-test was given.
+if test "${enable_self_test+set}" = set; then
+  enableval=$enable_self_test; if test x$enableval = xyes; then
+        self_test=true
+     else
+        self_test=false
+        cat >>confdefs.h <<\_ACEOF
+#define NO_SELF_TEST 1
+_ACEOF
+
+     fi
+else
+  self_test=true
+
+fi
+
+ if test x$self_test = xtrue; then
+  USE_SELF_TEST_TRUE=
+  USE_SELF_TEST_FALSE='#'
+else
+  USE_SELF_TEST_TRUE='#'
+  USE_SELF_TEST_FALSE=
+fi
+
+
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -5682,7 +5889,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5685 "configure"' > conftest.$ac_ext
+  echo '#line 5892 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6439,6 +6646,7 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -6468,9 +6676,7 @@ fi
 echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
   am__fastdepCXX_TRUE=
@@ -8004,11 +8210,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8007: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8213: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8011: \$? = $ac_status" >&5
+   echo "$as_me:8217: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8294,11 +8500,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8297: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8503: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8301: \$? = $ac_status" >&5
+   echo "$as_me:8507: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8398,11 +8604,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8401: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8607: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8405: \$? = $ac_status" >&5
+   echo "$as_me:8611: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10756,7 +10962,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10759 "configure"
+#line 10965 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10856,7 +11062,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10859 "configure"
+#line 11065 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13271,11 +13477,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13274: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13480: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13278: \$? = $ac_status" >&5
+   echo "$as_me:13484: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13375,11 +13581,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13378: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13584: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13382: \$? = $ac_status" >&5
+   echo "$as_me:13588: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14949,11 +15155,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14952: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15158: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14956: \$? = $ac_status" >&5
+   echo "$as_me:15162: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15053,11 +15259,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15056: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15262: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15060: \$? = $ac_status" >&5
+   echo "$as_me:15266: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17248,11 +17454,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17251: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17457: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17255: \$? = $ac_status" >&5
+   echo "$as_me:17461: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17538,11 +17744,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17541: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17747: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17545: \$? = $ac_status" >&5
+   echo "$as_me:17751: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17642,11 +17848,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17645: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17851: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17649: \$? = $ac_status" >&5
+   echo "$as_me:17855: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -21291,6 +21497,7 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -21320,9 +21527,7 @@ fi
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -21867,7 +22072,7 @@ ac_cv_lib_curl=ac_cv_lib_curl_main
 
 fi
 
-if test "$dbus" = "true"; then
+if test "$xml" = "true"; then
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -21990,20 +22195,20 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for dbus" >&5
-echo $ECHO_N "checking for dbus... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for xml" >&5
+echo $ECHO_N "checking for xml... $ECHO_C" >&6; }
 
 if test -n "$PKG_CONFIG"; then
-    if test -n "$dbus_CFLAGS"; then
-        pkg_cv_dbus_CFLAGS="$dbus_CFLAGS"
+    if test -n "$xml_CFLAGS"; then
+        pkg_cv_xml_CFLAGS="$xml_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_dbus_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null`
+  pkg_cv_xml_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22012,16 +22217,16 @@ else
 	pkg_failed=untried
 fi
 if test -n "$PKG_CONFIG"; then
-    if test -n "$dbus_LIBS"; then
-        pkg_cv_dbus_LIBS="$dbus_LIBS"
+    if test -n "$xml_LIBS"; then
+        pkg_cv_xml_LIBS="$xml_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_dbus_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null`
+  pkg_cv_xml_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22040,25 +22245,25 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        dbus_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1"`
+	        xml_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0"`
         else
-	        dbus_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1"`
+	        xml_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$dbus_PKG_ERRORS" >&5
+	echo "$xml_PKG_ERRORS" >&5
 
 	{ echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-                { { echo "$as_me:$LINENO: error: No libdbus package information found" >&5
-echo "$as_me: error: No libdbus package information found" >&2;}
+                { { echo "$as_me:$LINENO: error: No libxml2 package information found" >&5
+echo "$as_me: error: No libxml2 package information found" >&2;}
    { (exit 1); exit 1; }; }
 elif test $pkg_failed = untried; then
-	{ { echo "$as_me:$LINENO: error: No libdbus package information found" >&5
-echo "$as_me: error: No libdbus package information found" >&2;}
+	{ { echo "$as_me:$LINENO: error: No libxml2 package information found" >&5
+echo "$as_me: error: No libxml2 package information found" >&2;}
    { (exit 1); exit 1; }; }
 else
-	dbus_CFLAGS=$pkg_cv_dbus_CFLAGS
-	dbus_LIBS=$pkg_cv_dbus_LIBS
+	xml_CFLAGS=$pkg_cv_xml_CFLAGS
+	xml_LIBS=$pkg_cv_xml_LIBS
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 	:
@@ -22067,23 +22272,23 @@ fi
 
 fi
 
-if test "$xml" = "true"; then
+if test "$dbus" = "true"; then
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for xml" >&5
-echo $ECHO_N "checking for xml... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for dbus" >&5
+echo $ECHO_N "checking for dbus... $ECHO_C" >&6; }
 
 if test -n "$PKG_CONFIG"; then
-    if test -n "$xml_CFLAGS"; then
-        pkg_cv_xml_CFLAGS="$xml_CFLAGS"
+    if test -n "$dbus_CFLAGS"; then
+        pkg_cv_dbus_CFLAGS="$dbus_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_xml_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
+  pkg_cv_dbus_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22092,16 +22297,16 @@ else
 	pkg_failed=untried
 fi
 if test -n "$PKG_CONFIG"; then
-    if test -n "$xml_LIBS"; then
-        pkg_cv_xml_LIBS="$xml_LIBS"
+    if test -n "$dbus_LIBS"; then
+        pkg_cv_dbus_LIBS="$dbus_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_xml_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
+  pkg_cv_dbus_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22120,25 +22325,25 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        xml_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0"`
+	        dbus_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1"`
         else
-	        xml_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0"`
+	        dbus_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1"`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$xml_PKG_ERRORS" >&5
+	echo "$dbus_PKG_ERRORS" >&5
 
 	{ echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-                { { echo "$as_me:$LINENO: error: No libxml2 package information found" >&5
-echo "$as_me: error: No libxml2 package information found" >&2;}
+                { { echo "$as_me:$LINENO: error: No libdbus package information found" >&5
+echo "$as_me: error: No libdbus package information found" >&2;}
    { (exit 1); exit 1; }; }
 elif test $pkg_failed = untried; then
-	{ { echo "$as_me:$LINENO: error: No libxml2 package information found" >&5
-echo "$as_me: error: No libxml2 package information found" >&2;}
+	{ { echo "$as_me:$LINENO: error: No libdbus package information found" >&5
+echo "$as_me: error: No libdbus package information found" >&2;}
    { (exit 1); exit 1; }; }
 else
-	xml_CFLAGS=$pkg_cv_xml_CFLAGS
-	xml_LIBS=$pkg_cv_xml_LIBS
+	dbus_CFLAGS=$pkg_cv_dbus_CFLAGS
+	dbus_LIBS=$pkg_cv_dbus_LIBS
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 	:
@@ -22149,6 +22354,7 @@ fi
 
 
 
+
 { echo "$as_me:$LINENO: checking gmp.h version >= 4.1.4" >&5
 echo $ECHO_N "checking gmp.h version >= 4.1.4... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
@@ -22526,7 +22732,7 @@ fi
 fi
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/include/Makefile src/libstrongswan/Makefile src/libcrypto/Makefile src/libfreeswan/Makefile src/pluto/Makefile src/whack/Makefile src/charon/Makefile src/stroke/Makefile src/ipsec/Makefile src/starter/Makefile src/_updown/Makefile src/_updown_espmark/Makefile src/_copyright/Makefile src/openac/Makefile src/scepclient/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile src/include/Makefile src/libstrongswan/Makefile src/libcrypto/Makefile src/libfreeswan/Makefile src/pluto/Makefile src/whack/Makefile src/charon/Makefile src/stroke/Makefile src/ipsec/Makefile src/starter/Makefile src/_updown/Makefile src/_updown_espmark/Makefile src/_copyright/Makefile src/openac/Makefile src/scepclient/Makefile src/dumm/Makefile src/manager/Makefile testing/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -22696,6 +22902,13 @@ echo "$as_me: error: conditional \"USE_LIBXML\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${USE_LIBSQLITE_TRUE}" && test -z "${USE_LIBSQLITE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_LIBSQLITE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_LIBSQLITE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${USE_SMARTCARD_TRUE}" && test -z "${USE_SMARTCARD_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"USE_SMARTCARD\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -22738,6 +22951,48 @@ echo "$as_me: error: conditional \"USE_VENDORID\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${USE_XAUTH_VID_TRUE}" && test -z "${USE_XAUTH_VID_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_XAUTH_VID\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_XAUTH_VID\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${USE_UML_TRUE}" && test -z "${USE_UML_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_UML\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_UML\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${USE_MANAGER_TRUE}" && test -z "${USE_MANAGER_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_MANAGER\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_MANAGER\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${USE_P2P_TRUE}" && test -z "${USE_P2P_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_P2P\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_P2P\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${USE_INTEGRITY_TEST_TRUE}" && test -z "${USE_INTEGRITY_TEST_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_INTEGRITY_TEST\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_INTEGRITY_TEST\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${USE_SELF_TEST_TRUE}" && test -z "${USE_SELF_TEST_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_SELF_TEST\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_SELF_TEST\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -23052,7 +23307,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by strongSwan $as_me 4.1.4, which was
+This file was extended by strongSwan $as_me 4.1.8, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23099,7 +23354,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-strongSwan config.status 4.1.4
+strongSwan config.status 4.1.8
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -23110,6 +23365,7 @@ gives unlimited permission to copy, distribute and modify it."
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -23221,6 +23477,9 @@ do
     "src/_copyright/Makefile") CONFIG_FILES="$CONFIG_FILES src/_copyright/Makefile" ;;
     "src/openac/Makefile") CONFIG_FILES="$CONFIG_FILES src/openac/Makefile" ;;
     "src/scepclient/Makefile") CONFIG_FILES="$CONFIG_FILES src/scepclient/Makefile" ;;
+    "src/dumm/Makefile") CONFIG_FILES="$CONFIG_FILES src/dumm/Makefile" ;;
+    "src/manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/manager/Makefile" ;;
+    "testing/Makefile") CONFIG_FILES="$CONFIG_FILES testing/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -23322,6 +23581,7 @@ target_alias!$target_alias$ac_delim
 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
 CYGPATH_W!$CYGPATH_W$ac_delim
 PACKAGE!$PACKAGE$ac_delim
 VERSION!$VERSION$ac_delim
@@ -23367,6 +23627,8 @@ backenddir!$backenddir$ac_delim
 interfacedir!$interfacedir$ac_delim
 linuxdir!$linuxdir$ac_delim
 LINUX_HEADERS!$LINUX_HEADERS$ac_delim
+IPSEC_ROUTING_TABLE!$IPSEC_ROUTING_TABLE$ac_delim
+IPSEC_ROUTING_TABLE_PRIO!$IPSEC_ROUTING_TABLE_PRIO$ac_delim
 ipsecuid!$ipsecuid$ac_delim
 ipsecgid!$ipsecgid$ac_delim
 USE_LIBCURL_TRUE!$USE_LIBCURL_TRUE$ac_delim
@@ -23376,9 +23638,6 @@ USE_LIBLDAP_FALSE!$USE_LIBLDAP_FALSE$ac_delim
 USE_LIBDBUS_TRUE!$USE_LIBDBUS_TRUE$ac_delim
 USE_LIBDBUS_FALSE!$USE_LIBDBUS_FALSE$ac_delim
 USE_LIBXML_TRUE!$USE_LIBXML_TRUE$ac_delim
-USE_LIBXML_FALSE!$USE_LIBXML_FALSE$ac_delim
-USE_SMARTCARD_TRUE!$USE_SMARTCARD_TRUE$ac_delim
-USE_SMARTCARD_FALSE!$USE_SMARTCARD_FALSE$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -23420,6 +23679,11 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+USE_LIBXML_FALSE!$USE_LIBXML_FALSE$ac_delim
+USE_LIBSQLITE_TRUE!$USE_LIBSQLITE_TRUE$ac_delim
+USE_LIBSQLITE_FALSE!$USE_LIBSQLITE_FALSE$ac_delim
+USE_SMARTCARD_TRUE!$USE_SMARTCARD_TRUE$ac_delim
+USE_SMARTCARD_FALSE!$USE_SMARTCARD_FALSE$ac_delim
 USE_CISCO_QUIRKS_TRUE!$USE_CISCO_QUIRKS_TRUE$ac_delim
 USE_CISCO_QUIRKS_FALSE!$USE_CISCO_QUIRKS_FALSE$ac_delim
 USE_LEAK_DETECTIVE_TRUE!$USE_LEAK_DETECTIVE_TRUE$ac_delim
@@ -23430,6 +23694,18 @@ USE_NAT_TRANSPORT_TRUE!$USE_NAT_TRANSPORT_TRUE$ac_delim
 USE_NAT_TRANSPORT_FALSE!$USE_NAT_TRANSPORT_FALSE$ac_delim
 USE_VENDORID_TRUE!$USE_VENDORID_TRUE$ac_delim
 USE_VENDORID_FALSE!$USE_VENDORID_FALSE$ac_delim
+USE_XAUTH_VID_TRUE!$USE_XAUTH_VID_TRUE$ac_delim
+USE_XAUTH_VID_FALSE!$USE_XAUTH_VID_FALSE$ac_delim
+USE_UML_TRUE!$USE_UML_TRUE$ac_delim
+USE_UML_FALSE!$USE_UML_FALSE$ac_delim
+USE_MANAGER_TRUE!$USE_MANAGER_TRUE$ac_delim
+USE_MANAGER_FALSE!$USE_MANAGER_FALSE$ac_delim
+USE_P2P_TRUE!$USE_P2P_TRUE$ac_delim
+USE_P2P_FALSE!$USE_P2P_FALSE$ac_delim
+USE_INTEGRITY_TEST_TRUE!$USE_INTEGRITY_TEST_TRUE$ac_delim
+USE_INTEGRITY_TEST_FALSE!$USE_INTEGRITY_TEST_FALSE$ac_delim
+USE_SELF_TEST_TRUE!$USE_SELF_TEST_TRUE$ac_delim
+USE_SELF_TEST_FALSE!$USE_SELF_TEST_FALSE$ac_delim
 build!$build$ac_delim
 build_cpu!$build_cpu$ac_delim
 build_vendor!$build_vendor$ac_delim
@@ -23462,15 +23738,15 @@ YFLAGS!$YFLAGS$ac_delim
 GPERF!$GPERF$ac_delim
 PERL!$PERL$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
-dbus_CFLAGS!$dbus_CFLAGS$ac_delim
-dbus_LIBS!$dbus_LIBS$ac_delim
 xml_CFLAGS!$xml_CFLAGS$ac_delim
 xml_LIBS!$xml_LIBS$ac_delim
+dbus_CFLAGS!$dbus_CFLAGS$ac_delim
+dbus_LIBS!$dbus_LIBS$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 48; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -23697,6 +23973,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -23750,6 +24031,7 @@ s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
 
@@ -23784,8 +24066,9 @@ echo "$as_me: executing $ac_file commands" >&6;}
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \