[svn-upgrade] new version strongswan (4.5.0)

1 files changed, 1858 insertions, 728 deletions

diff --git a/configure b/configure
index 64ecd2c57..d823c3045 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for strongSwan 4.4.1.
+# Generated by GNU Autoconf 2.67 for strongSwan 4.5.0.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -316,7 +316,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -356,19 +356,19 @@ else
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -679,7 +679,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -698,8 +698,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='strongSwan'
 PACKAGE_TARNAME='strongswan'
-PACKAGE_VERSION='4.4.1'
-PACKAGE_STRING='strongSwan 4.4.1'
+PACKAGE_VERSION='4.5.0'
+PACKAGE_STRING='strongSwan 4.5.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -745,6 +745,8 @@ LTLIBOBJS
 LIBOBJS
 MONOLITHIC_FALSE
 MONOLITHIC_TRUE
+USE_TLS_FALSE
+USE_TLS_TRUE
 USE_SIMAKA_FALSE
 USE_SIMAKA_TRUE
 USE_VSTR_FALSE
@@ -797,6 +799,14 @@ USE_XAUTH_FALSE
 USE_XAUTH_TRUE
 USE_RESOLVE_FALSE
 USE_RESOLVE_TRUE
+USE_KERNEL_PFROUTE_FALSE
+USE_KERNEL_PFROUTE_TRUE
+USE_KERNEL_PFKEY_FALSE
+USE_KERNEL_PFKEY_TRUE
+USE_KERNEL_NETLINK_FALSE
+USE_KERNEL_NETLINK_TRUE
+USE_KERNEL_KLIPS_FALSE
+USE_KERNEL_KLIPS_TRUE
 USE_ATTR_SQL_FALSE
 USE_ATTR_SQL_TRUE
 USE_ATTR_FALSE
@@ -811,16 +821,22 @@ USE_SOCKET_RAW_FALSE
 USE_SOCKET_RAW_TRUE
 USE_SOCKET_DEFAULT_FALSE
 USE_SOCKET_DEFAULT_TRUE
-USE_KERNEL_KLIPS_FALSE
-USE_KERNEL_KLIPS_TRUE
-USE_KERNEL_PFROUTE_FALSE
-USE_KERNEL_PFROUTE_TRUE
-USE_KERNEL_PFKEY_FALSE
-USE_KERNEL_PFKEY_TRUE
-USE_KERNEL_NETLINK_FALSE
-USE_KERNEL_NETLINK_TRUE
+USE_TNCCS_20_FALSE
+USE_TNCCS_20_TRUE
+USE_TNCCS_11_FALSE
+USE_TNCCS_11_TRUE
+USE_TNC_IMV_FALSE
+USE_TNC_IMV_TRUE
+USE_TNC_IMC_FALSE
+USE_TNC_IMC_TRUE
 USE_EAP_RADIUS_FALSE
 USE_EAP_RADIUS_TRUE
+USE_EAP_TNC_FALSE
+USE_EAP_TNC_TRUE
+USE_EAP_TTLS_FALSE
+USE_EAP_TTLS_TRUE
+USE_EAP_TLS_FALSE
+USE_EAP_TLS_TRUE
 USE_EAP_MSCHAPV2_FALSE
 USE_EAP_MSCHAPV2_TRUE
 USE_EAP_AKA_3GPP2_FALSE
@@ -843,6 +859,8 @@ USE_EAP_SIM_FILE_FALSE
 USE_EAP_SIM_FILE_TRUE
 USE_EAP_SIM_FALSE
 USE_EAP_SIM_TRUE
+USE_LED_FALSE
+USE_LED_TRUE
 USE_HA_FALSE
 USE_HA_TRUE
 USE_LOAD_TESTER_FALSE
@@ -857,6 +875,8 @@ USE_SQL_FALSE
 USE_SQL_TRUE
 USE_SMP_FALSE
 USE_SMP_TRUE
+USE_MAEMO_FALSE
+USE_MAEMO_TRUE
 USE_ANDROID_FALSE
 USE_ANDROID_TRUE
 USE_UCI_FALSE
@@ -869,6 +889,14 @@ USE_MEDSRV_FALSE
 USE_MEDSRV_TRUE
 USE_STROKE_FALSE
 USE_STROKE_TRUE
+USE_GCM_FALSE
+USE_GCM_TRUE
+USE_CCM_FALSE
+USE_CCM_TRUE
+USE_CTR_FALSE
+USE_CTR_TRUE
+USE_PKCS11_FALSE
+USE_PKCS11_TRUE
 USE_AGENT_FALSE
 USE_AGENT_TRUE
 USE_GCRYPT_FALSE
@@ -925,11 +953,24 @@ USE_CURL_FALSE
 USE_CURL_TRUE
 USE_TEST_VECTORS_FALSE
 USE_TEST_VECTORS_TRUE
+s_plugins
+h_plugins
+p_plugins
+c_plugins
+medsrv_plugins
+manager_plugins
+scripts_plugins
+pki_plugins
+scepclient_plugins
+openac_plugins
+pool_plugins
 pluto_plugins
-libhydra_plugins
-libstrongswan_plugins
+libcharon_plugins
 nm_LIBS
 nm_CFLAGS
+dbusservicedir
+maemo_LIBS
+maemo_CFLAGS
 MYSQLCFLAG
 MYSQLLIB
 MYSQLCONFIG
@@ -1012,6 +1053,8 @@ strongswan_conf
 urandom_device
 random_device
 default_pkcs11
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKG_CONFIG
 am__untar
 am__tar
@@ -1140,7 +1183,14 @@ enable_eap_gtc
 enable_eap_aka
 enable_eap_aka_3gpp2
 enable_eap_mschapv2
+enable_eap_tls
+enable_eap_ttls
+enable_eap_tnc
 enable_eap_radius
+enable_tnc_imc
+enable_tnc_imv
+enable_tnccs_11
+enable_tnccs_20
 enable_kernel_netlink
 enable_kernel_pfkey
 enable_kernel_pfroute
@@ -1173,11 +1223,17 @@ enable_padlock
 enable_openssl
 enable_gcrypt
 enable_agent
+enable_pkcs11
+enable_ctr
+enable_ccm
+enable_gcm
 enable_addrblock
 enable_uci
 enable_android
+enable_maemo
 enable_nm
 enable_ha
+enable_led
 enable_vstr
 enable_monolithic
 enable_dependency_tracking
@@ -1193,6 +1249,8 @@ enable_libtool_lock
 host_alias
 target_alias
 PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
 CC
 CFLAGS
 LDFLAGS
@@ -1205,6 +1263,8 @@ xml_CFLAGS
 xml_LIBS
 gtk_CFLAGS
 gtk_LIBS
+maemo_CFLAGS
+maemo_LIBS
 nm_CFLAGS
 nm_LIBS'
 
@@ -1269,8 +1329,9 @@ do
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1315,7 +1376,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1341,7 +1402,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1545,7 +1606,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1561,7 +1622,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1591,8 +1652,8 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1600,7 +1661,7 @@ Try \`$0 --help' for more information."
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1618,13 +1679,13 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1647,7 +1708,7 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1661,8 +1722,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1677,9 +1738,9 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1718,11 +1779,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1748,7 +1809,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.4.1 to adapt to many kinds of systems.
+\`configure' configures strongSwan 4.5.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1762,7 +1823,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1818,7 +1879,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of strongSwan 4.4.1:";;
+     short | recursive ) echo "Configuration of strongSwan 4.5.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1870,7 +1931,7 @@ Optional Features:
   --enable-lock-profiler  enable lock/mutex profiling code.
   --enable-unit-tests     enable unit tests on IKEv2 daemon startup.
   --enable-load-tester    enable load testing plugin for IKEv2 daemon.
-  --enable-eap-sim        enable SIM authenication module for EAP.
+  --enable-eap-sim        enable SIM authentication module for EAP.
   --enable-eap-sim-file   enable EAP-SIM backend based on a triplet file.
   --enable-eap-simaka-sql enable EAP-SIM/AKA backend based on a
                           triplet/quintuplet SQL database.
@@ -1880,13 +1941,20 @@ Optional Features:
                           enable EAP-SIM/AKA reauthentication data storage
                           plugin.
   --enable-eap-identity   enable EAP module providing EAP-Identity helper.
-  --enable-eap-md5        enable EAP MD5 (CHAP) authenication module.
-  --enable-eap-gtc        enable PAM based EAP GTC authenication module.
+  --enable-eap-md5        enable EAP MD5 (CHAP) authentication module.
+  --enable-eap-gtc        enable PAM based EAP GTC authentication module.
   --enable-eap-aka        enable EAP AKA authentication module.
   --enable-eap-aka-3gpp2  enable EAP AKA backend implementing 3GPP2 algorithms
                           in software. Requires libgmp.
-  --enable-eap-mschapv2   enable EAP MS-CHAPv2 authenication module.
-  --enable-eap-radius     enable RADIUS proxy authenication module.
+  --enable-eap-mschapv2   enable EAP MS-CHAPv2 authentication module.
+  --enable-eap-tls        enable EAP TLS authentication module.
+  --enable-eap-ttls       enable EAP TTLS authentication module.
+  --enable-eap-tnc        enable EAP TNC trusted network connect module.
+  --enable-eap-radius     enable RADIUS proxy authentication module.
+  --enable-tnc-imc        enable TNC IMC module.
+  --enable-tnc-imv        enable TNC IMV module.
+  --enable-tnccs-11       enable TNCCS 1.1 protocol module.
+  --enable-tnccs-20       enable TNCCS 2.0 protocol module.
   --disable-kernel-netlink
                           disable the netlink kernel interface.
   --enable-kernel-pfkey   enable the PF_KEY kernel interface.
@@ -1932,11 +2000,18 @@ Optional Features:
   --enable-openssl        enables the OpenSSL crypto plugin.
   --enable-gcrypt         enables the libgcrypt plugin.
   --enable-agent          enables the ssh-agent signing plugin.
+  --enable-pkcs11         enables the PKCS11 token support plugin.
+  --enable-ctr            enables the Counter Mode wrapper crypto plugin.
+  --enable-ccm            enables the CCM AEAD wrapper crypto plugin.
+  --enable-gcm            enables the GCM AEAD wrapper crypto plugin.
   --enable-addrblock      enables RFC 3779 address block constraint support.
   --enable-uci            enable OpenWRT UCI configuration plugin.
   --enable-android        enable Android specific plugin.
+  --enable-maemo          enable Maemo specific plugin.
   --enable-nm             enable NetworkManager plugin.
   --enable-ha             enable high availability cluster plugin.
+  --enable-led            enable plugin to control LEDs on IKEv2 activity
+                          using the Linux kernel LED subsystem.
   --enable-vstr           enforce using the Vstr string library to replace
                           glibc-like printf hooks.
   --enable-monolithic     build monolithic version of libstrongswan that
@@ -2000,6 +2075,10 @@ Optional Packages:
 
 Some influential environment variables:
   PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -2017,6 +2096,9 @@ Some influential environment variables:
   xml_LIBS    linker flags for xml, overriding pkg-config
   gtk_CFLAGS  C compiler flags for gtk, overriding pkg-config
   gtk_LIBS    linker flags for gtk, overriding pkg-config
+  maemo_CFLAGS
+              C compiler flags for maemo, overriding pkg-config
+  maemo_LIBS  linker flags for maemo, overriding pkg-config
   nm_CFLAGS   C compiler flags for nm, overriding pkg-config
   nm_LIBS     linker flags for nm, overriding pkg-config
 
@@ -2086,10 +2168,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-strongSwan configure 4.4.1
-generated by GNU Autoconf 2.65
+strongSwan configure 4.5.0
+generated by GNU Autoconf 2.67
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2138,6 +2220,43 @@ fi
 
 } # ac_fn_c_try_compile
 
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
 # ac_fn_c_try_run LINENO
 # ----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
@@ -2180,43 +2299,6 @@ fi
 
 } # ac_fn_c_try_run
 
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -2226,7 +2308,7 @@ ac_fn_c_check_header_compile ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2302,7 +2384,7 @@ ac_fn_c_check_func ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2370,7 +2452,7 @@ ac_fn_c_check_type ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -2423,10 +2505,10 @@ $as_echo "$ac_res" >&6; }
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval "test \"\${$3+set}\"" = set; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2462,7 +2544,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -2489,7 +2571,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2511,7 +2593,7 @@ ac_fn_c_check_member ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$4+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2562,8 +2644,8 @@ 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.4.1, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+It was created by strongSwan $as_me 4.5.0, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
 
@@ -2673,11 +2755,9 @@ trap 'exit_status=$?
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2711,11 +2791,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2728,11 +2806,9 @@ _ASBOX
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -2746,11 +2822,9 @@ _ASBOX
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2805,7 +2879,12 @@ _ACEOF
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2820,7 +2899,11 @@ do
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5 ; }
   fi
 done
 
@@ -2896,7 +2979,7 @@ if $ac_cache_corrupted; then
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2913,16 +2996,22 @@ am__api_version='1.11'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3038,11 +3127,11 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -3064,7 +3153,7 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
    fi
 
@@ -3074,7 +3163,7 @@ then
    # Ok.
    :
 else
-   as_fn_error "newly created file is older than distributed files!
+   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -3312,7 +3401,7 @@ done
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -3320,7 +3409,7 @@ SHELL = /bin/sh
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3354,7 +3443,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -3370,7 +3459,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='strongswan'
- VERSION='4.4.1'
+ VERSION='4.5.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3494,6 +3583,10 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
+
+
+
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -3606,7 +3699,6 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
-
 fi
 
 
@@ -4530,6 +4622,51 @@ else
 fi
 
 
+# Check whether --enable-eap-tls was given.
+if test "${enable_eap_tls+set}" = set; then :
+  enableval=$enable_eap_tls; eap_tls_given=true
+		if test x$enableval = xyes; then
+			eap_tls=true
+		 else
+			eap_tls=false
+		fi
+else
+  eap_tls=false
+		eap_tls_given=false
+
+fi
+
+
+# Check whether --enable-eap-ttls was given.
+if test "${enable_eap_ttls+set}" = set; then :
+  enableval=$enable_eap_ttls; eap_ttls_given=true
+		if test x$enableval = xyes; then
+			eap_ttls=true
+		 else
+			eap_ttls=false
+		fi
+else
+  eap_ttls=false
+		eap_ttls_given=false
+
+fi
+
+
+# Check whether --enable-eap-tnc was given.
+if test "${enable_eap_tnc+set}" = set; then :
+  enableval=$enable_eap_tnc; eap_tnc_given=true
+		if test x$enableval = xyes; then
+			eap_tnc=true
+		 else
+			eap_tnc=false
+		fi
+else
+  eap_tnc=false
+		eap_tnc_given=false
+
+fi
+
+
 # Check whether --enable-eap-radius was given.
 if test "${enable_eap_radius+set}" = set; then :
   enableval=$enable_eap_radius; eap_radius_given=true
@@ -4545,6 +4682,66 @@ else
 fi
 
 
+# Check whether --enable-tnc-imc was given.
+if test "${enable_tnc_imc+set}" = set; then :
+  enableval=$enable_tnc_imc; tnc_imc_given=true
+		if test x$enableval = xyes; then
+			tnc_imc=true
+		 else
+			tnc_imc=false
+		fi
+else
+  tnc_imc=false
+		tnc_imc_given=false
+
+fi
+
+
+# Check whether --enable-tnc-imv was given.
+if test "${enable_tnc_imv+set}" = set; then :
+  enableval=$enable_tnc_imv; tnc_imv_given=true
+		if test x$enableval = xyes; then
+			tnc_imv=true
+		 else
+			tnc_imv=false
+		fi
+else
+  tnc_imv=false
+		tnc_imv_given=false
+
+fi
+
+
+# Check whether --enable-tnccs-11 was given.
+if test "${enable_tnccs_11+set}" = set; then :
+  enableval=$enable_tnccs_11; tnccs_11_given=true
+		if test x$enableval = xyes; then
+			tnccs_11=true
+		 else
+			tnccs_11=false
+		fi
+else
+  tnccs_11=false
+		tnccs_11_given=false
+
+fi
+
+
+# Check whether --enable-tnccs-20 was given.
+if test "${enable_tnccs_20+set}" = set; then :
+  enableval=$enable_tnccs_20; tnccs_20_given=true
+		if test x$enableval = xyes; then
+			tnccs_20=true
+		 else
+			tnccs_20=false
+		fi
+else
+  tnccs_20=false
+		tnccs_20_given=false
+
+fi
+
+
 # Check whether --enable-kernel-netlink was given.
 if test "${enable_kernel_netlink+set}" = set; then :
   enableval=$enable_kernel_netlink; kernel_netlink_given=true
@@ -5025,6 +5222,66 @@ else
 fi
 
 
+# Check whether --enable-pkcs11 was given.
+if test "${enable_pkcs11+set}" = set; then :
+  enableval=$enable_pkcs11; pkcs11_given=true
+		if test x$enableval = xyes; then
+			pkcs11=true
+		 else
+			pkcs11=false
+		fi
+else
+  pkcs11=false
+		pkcs11_given=false
+
+fi
+
+
+# Check whether --enable-ctr was given.
+if test "${enable_ctr+set}" = set; then :
+  enableval=$enable_ctr; ctr_given=true
+		if test x$enableval = xyes; then
+			ctr=true
+		 else
+			ctr=false
+		fi
+else
+  ctr=false
+		ctr_given=false
+
+fi
+
+
+# Check whether --enable-ccm was given.
+if test "${enable_ccm+set}" = set; then :
+  enableval=$enable_ccm; ccm_given=true
+		if test x$enableval = xyes; then
+			ccm=true
+		 else
+			ccm=false
+		fi
+else
+  ccm=false
+		ccm_given=false
+
+fi
+
+
+# Check whether --enable-gcm was given.
+if test "${enable_gcm+set}" = set; then :
+  enableval=$enable_gcm; gcm_given=true
+		if test x$enableval = xyes; then
+			gcm=true
+		 else
+			gcm=false
+		fi
+else
+  gcm=false
+		gcm_given=false
+
+fi
+
+
 # Check whether --enable-addrblock was given.
 if test "${enable_addrblock+set}" = set; then :
   enableval=$enable_addrblock; addrblock_given=true
@@ -5070,6 +5327,21 @@ else
 fi
 
 
+# Check whether --enable-maemo was given.
+if test "${enable_maemo+set}" = set; then :
+  enableval=$enable_maemo; maemo_given=true
+		if test x$enableval = xyes; then
+			maemo=true
+		 else
+			maemo=false
+		fi
+else
+  maemo=false
+		maemo_given=false
+
+fi
+
+
 # Check whether --enable-nm was given.
 if test "${enable_nm+set}" = set; then :
   enableval=$enable_nm; nm_given=true
@@ -5100,6 +5372,21 @@ else
 fi
 
 
+# Check whether --enable-led was given.
+if test "${enable_led+set}" = set; then :
+  enableval=$enable_led; led_given=true
+		if test x$enableval = xyes; then
+			led=true
+		 else
+			led=false
+		fi
+else
+  led=false
+		led_given=false
+
+fi
+
+
 # Check whether --enable-vstr was given.
 if test "${enable_vstr+set}" = set; then :
   enableval=$enable_vstr; vstr_given=true
@@ -5435,8 +5722,8 @@ fi
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -5550,9 +5837,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -5594,8 +5880,8 @@ done
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -5652,9 +5938,9 @@ $as_echo "$ac_try_echo"; } >&5
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
     fi
   fi
 fi
@@ -5705,8 +5991,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -6117,7 +6403,7 @@ fi
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
@@ -6128,16 +6414,16 @@ else
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -6162,7 +6448,7 @@ else
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -6170,7 +6456,7 @@ fi
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -6187,155 +6473,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
-                  acl_libdirstem=lib
-  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-  if test -n "$searchpath"; then
-    acl_save_IFS="${IFS= 	}"; IFS=":"
-    for searchdir in $searchpath; do
-      if test -d "$searchdir"; then
-        case "$searchdir" in
-          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-          *) searchdir=`cd "$searchdir" && pwd`
-             case "$searchdir" in
-               */lib64 ) acl_libdirstem=lib64 ;;
-             esac ;;
-        esac
-      fi
-    done
-    IFS="$acl_save_IFS"
-  fi
-
-
-      if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-
-
-
-
-
-
-
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-lib-prefix was given.
-if test "${with_lib_prefix+set}" = set; then :
-  withval=$with_lib_prefix;
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-      fi
-    fi
-
-fi
-
-  if test $use_additional = yes; then
-                            if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-                        CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
-      fi
-    fi
-                            if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
-      haveit=
-      for x in $LDFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-                        LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6378,7 +6515,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -6394,11 +6531,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -6437,7 +6574,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -6453,18 +6590,18 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -6525,7 +6662,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -6591,7 +6728,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -6604,6 +6741,199 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
+
+
+  acl_libdirstem=lib
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+$as_echo_n "checking for 64-bit host... " >&6; }
+if test "${gl_cv_solaris_64bit+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef _LP64
+sixtyfour bits
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
+  gl_cv_solaris_64bit=yes
+else
+  gl_cv_solaris_64bit=no
+fi
+rm -f conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
+$as_echo "$gl_cv_solaris_64bit" >&6; }
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+        esac
+      fi
+      ;;
+    *)
+      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+      if test -n "$searchpath"; then
+        acl_save_IFS="${IFS= 	}"; IFS=":"
+        for searchdir in $searchpath; do
+          if test -d "$searchdir"; then
+            case "$searchdir" in
+              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
+      fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+
+
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+
+
+
+
+
+
+
+    use_additional=yes
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+
+# Check whether --with-lib-prefix was given.
+if test "${with_lib_prefix+set}" = set; then :
+  withval=$with_lib_prefix;
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+
+fi
+
+  if test $use_additional = yes; then
+                            if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_includedir" = "X/usr/local/include"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_includedir"; then
+                        CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+                            if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+      haveit=
+      for x in $LDFLAGS; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+                        LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
+  fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then :
@@ -6723,8 +7053,7 @@ do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -6954,8 +7283,8 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
-     as_fn_error "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
  esac
 
 
@@ -7043,7 +7372,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
@@ -7122,7 +7451,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -7238,7 +7567,7 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -7440,13 +7769,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:7443: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:7772: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7446: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:7775: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7449: output\"" >&5)
+  (eval echo "\"\$as_me:7778: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -8651,7 +8980,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8654 "configure"' > conftest.$ac_ext
+  echo '#line 8983 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9913,11 +10242,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:9916: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10245: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9920: \$? = $ac_status" >&5
+   echo "$as_me:10249: \$? = $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.
@@ -10252,11 +10581,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:10255: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10584: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10259: \$? = $ac_status" >&5
+   echo "$as_me:10588: \$? = $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.
@@ -10357,11 +10686,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:10360: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10689: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10364: \$? = $ac_status" >&5
+   echo "$as_me:10693: \$? = $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
@@ -10412,11 +10741,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:10415: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10744: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10419: \$? = $ac_status" >&5
+   echo "$as_me:10748: \$? = $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
@@ -12796,7 +13125,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12799 "configure"
+#line 13128 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12892,7 +13221,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12895 "configure"
+#line 13224 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13173,7 +13502,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -13313,7 +13642,7 @@ if test -f lex.yy.c; then
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
-  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
+  as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
@@ -13534,7 +13863,7 @@ if test -n "$ipsecuid"; then
 $as_echo "$ipsecuid" >&6; }
 
 else
-	as_fn_error "not found" "$LINENO" 5
+	as_fn_error $? "not found" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gid of group \"$ipsecgroup\"" >&5
 $as_echo_n "checking for gid of group \"$ipsecgroup\"... " >&6; }
@@ -13544,7 +13873,7 @@ if test -n "$ipsecgid"; then
 $as_echo "$ipsecgid" >&6; }
 
 else
-	as_fn_error "not found" "$LINENO" 5
+	as_fn_error $? "not found" "$LINENO" 5
 fi
 
 
@@ -13562,6 +13891,10 @@ if test x$eap_sim = xtrue; then
 	simaka=true;
 fi
 
+if test x$eap_tls = xtrue -o x$eap_ttls = xtrue; then
+	tls=true;
+fi
+
 if test x$fips_prf = xtrue; then
 	if test x$openssl = xfalse; then
 		sha1=true;
@@ -13834,8 +14167,7 @@ if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -14414,8 +14746,7 @@ for ac_header in net/pfkeyv2.h netipsec/ipsec.h netinet6/ipsec.h linux/udp.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -14672,7 +15003,7 @@ $as_echo "$ac_cv_lib_vstr_main" >&6; }
 if test "x$ac_cv_lib_vstr_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "Vstr string library not found" "$LINENO" 5
+  as_fn_error $? "Vstr string library not found" "$LINENO" 5
 fi
 ac_cv_lib_vstr=ac_cv_lib_vstr_main
 
@@ -14720,7 +15051,7 @@ _ACEOF
   LIBS="-lgmp $LIBS"
 
 else
-  as_fn_error "GNU Multi Precision library gmp not found" "$LINENO" 5
+  as_fn_error $? "GNU Multi Precision library gmp not found" "$LINENO" 5
 fi
 ac_cv_lib_gmp=ac_cv_lib_gmp_main
 
@@ -14777,7 +15108,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
 $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }; as_fn_error "No usable gmp.h found!" "$LINENO" 5
+$as_echo "no" >&6; }; as_fn_error $? "No usable gmp.h found!" "$LINENO" 5
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -14817,7 +15148,7 @@ $as_echo "$ac_cv_lib_ldap_main" >&6; }
 if test "x$ac_cv_lib_ldap_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "LDAP library ldap not found" "$LINENO" 5
+  as_fn_error $? "LDAP library ldap not found" "$LINENO" 5
 fi
 ac_cv_lib_ldap=ac_cv_lib_ldap_main
 
@@ -14854,7 +15185,7 @@ $as_echo "$ac_cv_lib_lber_main" >&6; }
 if test "x$ac_cv_lib_lber_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "LDAP library lber not found" "$LINENO" 5
+  as_fn_error $? "LDAP library lber not found" "$LINENO" 5
 fi
 ac_cv_lib_lber=ac_cv_lib_lber_main
 
@@ -14862,7 +15193,7 @@ ac_cv_lib_lber=ac_cv_lib_lber_main
 if test "x$ac_cv_header_ldap_h" = x""yes; then :
 
 else
-  as_fn_error "LDAP header ldap.h not found!" "$LINENO" 5
+  as_fn_error $? "LDAP header ldap.h not found!" "$LINENO" 5
 fi
 
 
@@ -14902,7 +15233,7 @@ $as_echo "$ac_cv_lib_curl_main" >&6; }
 if test "x$ac_cv_lib_curl_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "CURL library curl not found" "$LINENO" 5
+  as_fn_error $? "CURL library curl not found" "$LINENO" 5
 fi
 ac_cv_lib_curl=ac_cv_lib_curl_main
 
@@ -14910,7 +15241,7 @@ ac_cv_lib_curl=ac_cv_lib_curl_main
 if test "x$ac_cv_header_curl_curl_h" = x""yes; then :
 
 else
-  as_fn_error "CURL header curl/curl.h not found!" "$LINENO" 5
+  as_fn_error $? "CURL header curl/curl.h not found!" "$LINENO" 5
 fi
 
 
@@ -14922,11 +15253,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml" >&5
 $as_echo_n "checking for xml... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$xml_CFLAGS"; then
-        pkg_cv_xml_CFLAGS="$xml_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$xml_CFLAGS"; then
+    pkg_cv_xml_CFLAGS="$xml_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
   ac_status=$?
@@ -14936,15 +15266,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$xml_LIBS"; then
-        pkg_cv_xml_LIBS="$xml_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$xml_LIBS"; then
+    pkg_cv_xml_LIBS="$xml_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
   ac_status=$?
@@ -14954,14 +15282,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -14969,14 +15298,14 @@ 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"`
+	        xml_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0" 2>&1`
         else
-	        xml_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0"`
+	        xml_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$xml_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (libxml-2.0) were not met:
+	as_fn_error $? "Package requirements (libxml-2.0) were not met:
 
 $xml_PKG_ERRORS
 
@@ -14985,12 +15314,13 @@ installed software in a non-standard prefix.
 
 Alternatively, you may set the environment variables xml_CFLAGS
 and xml_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -14999,13 +15329,13 @@ and xml_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	xml_CFLAGS=$pkg_cv_xml_CFLAGS
 	xml_LIBS=$pkg_cv_xml_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+
 fi
 
 
@@ -15017,11 +15347,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk" >&5
 $as_echo_n "checking for gtk... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$gtk_CFLAGS"; then
-        pkg_cv_gtk_CFLAGS="$gtk_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$gtk_CFLAGS"; then
+    pkg_cv_gtk_CFLAGS="$gtk_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 vte\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 vte") 2>&5
   ac_status=$?
@@ -15031,15 +15360,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$gtk_LIBS"; then
-        pkg_cv_gtk_LIBS="$gtk_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$gtk_LIBS"; then
+    pkg_cv_gtk_LIBS="$gtk_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 vte\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 vte") 2>&5
   ac_status=$?
@@ -15049,14 +15376,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -15064,14 +15392,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        gtk_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 vte"`
+	        gtk_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 vte" 2>&1`
         else
-	        gtk_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 vte"`
+	        gtk_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 vte" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$gtk_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (gtk+-2.0 vte) were not met:
+	as_fn_error $? "Package requirements (gtk+-2.0 vte) were not met:
 
 $gtk_PKG_ERRORS
 
@@ -15080,12 +15408,13 @@ installed software in a non-standard prefix.
 
 Alternatively, you may set the environment variables gtk_CFLAGS
 and gtk_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -15094,13 +15423,13 @@ and gtk_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	gtk_CFLAGS=$pkg_cv_gtk_CFLAGS
 	gtk_LIBS=$pkg_cv_gtk_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+
 fi
 
 
@@ -15162,14 +15491,14 @@ $as_echo "$i" >&6; }
 				fi
 			done
 			if test x"$RUBYINCLUDE" = xnone; then
-				as_fn_error "ruby.h not found" "$LINENO" 5
+				as_fn_error $? "ruby.h not found" "$LINENO" 5
 			fi
 
 		else
-			as_fn_error "unable to determine ruby configuration" "$LINENO" 5
+			as_fn_error $? "unable to determine ruby configuration" "$LINENO" 5
 		fi
 	else
-		as_fn_error "don't know how to run ruby" "$LINENO" 5
+		as_fn_error $? "don't know how to run ruby" "$LINENO" 5
 	fi
 fi
 
@@ -15207,7 +15536,7 @@ $as_echo "$ac_cv_lib_neo_cgi_main" >&6; }
 if test "x$ac_cv_lib_neo_cgi_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "ClearSilver library neo_cgi not found!" "$LINENO" 5
+  as_fn_error $? "ClearSilver library neo_cgi not found!" "$LINENO" 5
 fi
 ac_cv_lib_neo_cgi=ac_cv_lib_neo_cgi_main
 
@@ -15244,7 +15573,7 @@ $as_echo "$ac_cv_lib_neo_utl_main" >&6; }
 if test "x$ac_cv_lib_neo_utl_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "ClearSilver library neo_utl not found!" "$LINENO" 5
+  as_fn_error $? "ClearSilver library neo_utl not found!" "$LINENO" 5
 fi
 ac_cv_lib_neo_utl=ac_cv_lib_neo_utl_main
 
@@ -15281,7 +15610,7 @@ $as_echo "$ac_cv_lib_z_main" >&6; }
 if test "x$ac_cv_lib_z_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "ClearSilver dependency zlib not found!" "$LINENO" 5
+  as_fn_error $? "ClearSilver dependency zlib not found!" "$LINENO" 5
 fi
 ac_cv_lib_z=ac_cv_lib_z_main
 
@@ -15319,7 +15648,7 @@ $as_echo "$ac_cv_lib_fcgi_main" >&6; }
 if test "x$ac_cv_lib_fcgi_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "FastCGI library fcgi not found!" "$LINENO" 5
+  as_fn_error $? "FastCGI library fcgi not found!" "$LINENO" 5
 fi
 ac_cv_lib_fcgi=ac_cv_lib_fcgi_main
 
@@ -15327,7 +15656,7 @@ ac_cv_lib_fcgi=ac_cv_lib_fcgi_main
 if test "x$ac_cv_header_fcgiapp_h" = x""yes; then :
 
 else
-  as_fn_error "FastCGI header file fcgiapp.h not found!" "$LINENO" 5
+  as_fn_error $? "FastCGI header file fcgiapp.h not found!" "$LINENO" 5
 fi
 
 
@@ -15376,7 +15705,7 @@ fi
 
 
 	if test x$MYSQLCONFIG = x; then
-		as_fn_error "mysql_config not found!" "$LINENO" 5
+		as_fn_error $? "mysql_config not found!" "$LINENO" 5
 	fi
 	MYSQLLIB=`$MYSQLCONFIG --libs_r`
 
@@ -15418,7 +15747,7 @@ $as_echo "$ac_cv_lib_sqlite3_main" >&6; }
 if test "x$ac_cv_lib_sqlite3_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "SQLite library sqlite3 not found" "$LINENO" 5
+  as_fn_error $? "SQLite library sqlite3 not found" "$LINENO" 5
 fi
 ac_cv_lib_sqlite3=ac_cv_lib_sqlite3_main
 
@@ -15426,7 +15755,7 @@ ac_cv_lib_sqlite3=ac_cv_lib_sqlite3_main
 if test "x$ac_cv_header_sqlite3_h" = x""yes; then :
 
 else
-  as_fn_error "SQLite header sqlite3.h not found!" "$LINENO" 5
+  as_fn_error $? "SQLite header sqlite3.h not found!" "$LINENO" 5
 fi
 
 
@@ -15478,7 +15807,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
 $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }; as_fn_error "SQLite version >= 3.3.1 required!" "$LINENO" 5
+$as_echo "no" >&6; }; as_fn_error $? "SQLite version >= 3.3.1 required!" "$LINENO" 5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
@@ -15517,7 +15846,7 @@ $as_echo "$ac_cv_lib_crypto_main" >&6; }
 if test "x$ac_cv_lib_crypto_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "OpenSSL crypto library not found" "$LINENO" 5
+  as_fn_error $? "OpenSSL crypto library not found" "$LINENO" 5
 fi
 ac_cv_lib_crypto=ac_cv_lib_crypto_main
 
@@ -15525,7 +15854,7 @@ ac_cv_lib_crypto=ac_cv_lib_crypto_main
 if test "x$ac_cv_header_openssl_evp_h" = x""yes; then :
 
 else
-  as_fn_error "OpenSSL header openssl/evp.h not found!" "$LINENO" 5
+  as_fn_error $? "OpenSSL header openssl/evp.h not found!" "$LINENO" 5
 fi
 
 
@@ -15565,7 +15894,7 @@ $as_echo "$ac_cv_lib_gcrypt_main" >&6; }
 if test "x$ac_cv_lib_gcrypt_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "gcrypt library not found" "$LINENO" 5
+  as_fn_error $? "gcrypt library not found" "$LINENO" 5
 fi
 ac_cv_lib_gcrypt=ac_cv_lib_gcrypt_main
 
@@ -15573,7 +15902,7 @@ ac_cv_lib_gcrypt=ac_cv_lib_gcrypt_main
 if test "x$ac_cv_header_gcrypt_h" = x""yes; then :
 
 else
-  as_fn_error "gcrypt header gcrypt.h not found!" "$LINENO" 5
+  as_fn_error $? "gcrypt header gcrypt.h not found!" "$LINENO" 5
 fi
 
 
@@ -15602,6 +15931,17 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
+if test x$tnccs_11 = xtrue -o x$tnc_imc = xtrue -o x$tnc_imv = xtrue; then
+	ac_fn_c_check_header_mongrel "$LINENO" "libtnc.h" "ac_cv_header_libtnc_h" "$ac_includes_default"
+if test "x$ac_cv_header_libtnc_h" = x""yes; then :
+
+else
+  as_fn_error $? "libtnc header libtnc.h not found!" "$LINENO" 5
+fi
+
+
+fi
+
 if test x$uci = xtrue; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -luci" >&5
 $as_echo_n "checking for main in -luci... " >&6; }
@@ -15636,7 +15976,7 @@ $as_echo "$ac_cv_lib_uci_main" >&6; }
 if test "x$ac_cv_lib_uci_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "UCI library libuci not found" "$LINENO" 5
+  as_fn_error $? "UCI library libuci not found" "$LINENO" 5
 fi
 ac_cv_lib_uci=ac_cv_lib_uci_main
 
@@ -15644,7 +15984,7 @@ ac_cv_lib_uci=ac_cv_lib_uci_main
 if test "x$ac_cv_header_uci_h" = x""yes; then :
 
 else
-  as_fn_error "UCI header uci.h not found!" "$LINENO" 5
+  as_fn_error $? "UCI header uci.h not found!" "$LINENO" 5
 fi
 
 
@@ -15684,7 +16024,7 @@ $as_echo "$ac_cv_lib_cutils_main" >&6; }
 if test "x$ac_cv_lib_cutils_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "Android library libcutils not found" "$LINENO" 5
+  as_fn_error $? "Android library libcutils not found" "$LINENO" 5
 fi
 ac_cv_lib_cutils=ac_cv_lib_cutils_main
 
@@ -15692,7 +16032,7 @@ ac_cv_lib_cutils=ac_cv_lib_cutils_main
 if test "x$ac_cv_header_cutils_properties_h" = x""yes; then :
 
 else
-  as_fn_error "Android header cutils/properties.h not found!" "$LINENO" 5
+  as_fn_error $? "Android header cutils/properties.h not found!" "$LINENO" 5
 fi
 
 
@@ -15700,6 +16040,102 @@ fi
 
 fi
 
+if test x$maemo = xtrue; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for maemo" >&5
+$as_echo_n "checking for maemo... " >&6; }
+
+if test -n "$maemo_CFLAGS"; then
+    pkg_cv_maemo_CFLAGS="$maemo_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gthread-2.0 libosso osso-af-settings\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 gthread-2.0 libosso osso-af-settings") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_maemo_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 gthread-2.0 libosso osso-af-settings" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$maemo_LIBS"; then
+    pkg_cv_maemo_LIBS="$maemo_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gthread-2.0 libosso osso-af-settings\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 gthread-2.0 libosso osso-af-settings") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_maemo_LIBS=`$PKG_CONFIG --libs "glib-2.0 gthread-2.0 libosso osso-af-settings" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        maemo_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 gthread-2.0 libosso osso-af-settings" 2>&1`
+        else
+	        maemo_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 gthread-2.0 libosso osso-af-settings" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$maemo_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (glib-2.0 gthread-2.0 libosso osso-af-settings) were not met:
+
+$maemo_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables maemo_CFLAGS
+and maemo_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables maemo_CFLAGS
+and maemo_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+	maemo_CFLAGS=$pkg_cv_maemo_CFLAGS
+	maemo_LIBS=$pkg_cv_maemo_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+	dbusservicedir="/usr/share/dbus-1/system-services"
+
+fi
+
 if test x$nm = xtrue; then
 	if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-glib\""; } >&5
@@ -15712,11 +16148,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nm" >&5
 $as_echo_n "checking for nm... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$nm_CFLAGS"; then
-        pkg_cv_nm_CFLAGS="$nm_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$nm_CFLAGS"; then
+    pkg_cv_nm_CFLAGS="$nm_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn\""; } >&5
   ($PKG_CONFIG --exists --print-errors "NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn") 2>&5
   ac_status=$?
@@ -15726,15 +16161,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$nm_LIBS"; then
-        pkg_cv_nm_LIBS="$nm_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$nm_LIBS"; then
+    pkg_cv_nm_LIBS="$nm_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn\""; } >&5
   ($PKG_CONFIG --exists --print-errors "NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn") 2>&5
   ac_status=$?
@@ -15744,14 +16177,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -15759,14 +16193,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        nm_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn"`
+	        nm_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn" 2>&1`
         else
-	        nm_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn"`
+	        nm_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$nm_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn) were not met:
+	as_fn_error $? "Package requirements (NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn) were not met:
 
 $nm_PKG_ERRORS
 
@@ -15775,12 +16209,13 @@ installed software in a non-standard prefix.
 
 Alternatively, you may set the environment variables nm_CFLAGS
 and nm_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -15789,13 +16224,13 @@ and nm_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	nm_CFLAGS=$pkg_cv_nm_CFLAGS
 	nm_LIBS=$pkg_cv_nm_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+
 fi
 else
 
@@ -15803,11 +16238,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nm" >&5
 $as_echo_n "checking for nm... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$nm_CFLAGS"; then
-        pkg_cv_nm_CFLAGS="$nm_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$nm_CFLAGS"; then
+    pkg_cv_nm_CFLAGS="$nm_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn\""; } >&5
   ($PKG_CONFIG --exists --print-errors "NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn") 2>&5
   ac_status=$?
@@ -15817,15 +16251,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$nm_LIBS"; then
-        pkg_cv_nm_LIBS="$nm_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$nm_LIBS"; then
+    pkg_cv_nm_LIBS="$nm_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn\""; } >&5
   ($PKG_CONFIG --exists --print-errors "NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn") 2>&5
   ac_status=$?
@@ -15835,14 +16267,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -15850,14 +16283,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        nm_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn"`
+	        nm_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn" 2>&1`
         else
-	        nm_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn"`
+	        nm_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$nm_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn) were not met:
+	as_fn_error $? "Package requirements (NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn) were not met:
 
 $nm_PKG_ERRORS
 
@@ -15866,12 +16299,13 @@ installed software in a non-standard prefix.
 
 Alternatively, you may set the environment variables nm_CFLAGS
 and nm_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -15880,13 +16314,13 @@ and nm_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	nm_CFLAGS=$pkg_cv_nm_CFLAGS
 	nm_LIBS=$pkg_cv_nm_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+
 fi
 
 fi
@@ -15928,7 +16362,7 @@ $as_echo "$ac_cv_lib_pam_main" >&6; }
 if test "x$ac_cv_lib_pam_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "PAM library not found" "$LINENO" 5
+  as_fn_error $? "PAM library not found" "$LINENO" 5
 fi
 ac_cv_lib_pam=ac_cv_lib_pam_main
 
@@ -15936,7 +16370,7 @@ ac_cv_lib_pam=ac_cv_lib_pam_main
 if test "x$ac_cv_header_security_pam_appl_h" = x""yes; then :
 
 else
-  as_fn_error "PAM header security/pam_appl.h not found!" "$LINENO" 5
+  as_fn_error $? "PAM header security/pam_appl.h not found!" "$LINENO" 5
 fi
 
 
@@ -15961,7 +16395,7 @@ done
 if test "x$ac_cv_func_capset" = x""yes; then :
 
 else
-  as_fn_error "capset() not found!" "$LINENO" 5
+  as_fn_error $? "capset() not found!" "$LINENO" 5
 fi
 
 	$as_echo "#define CAPABILITIES_NATIVE 1" >>confdefs.h
@@ -16002,7 +16436,7 @@ $as_echo "$ac_cv_lib_cap_main" >&6; }
 if test "x$ac_cv_lib_cap_main" = x""yes; then :
   LIBS="$LIBS"
 else
-  as_fn_error "libcap library not found" "$LINENO" 5
+  as_fn_error $? "libcap library not found" "$LINENO" 5
 fi
 ac_cv_lib_cap=ac_cv_lib_cap_main
 
@@ -16011,7 +16445,7 @@ if test "x$ac_cv_header_sys_capability_h" = x""yes; then :
   $as_echo "#define HAVE_SYS_CAPABILITY_H 1" >>confdefs.h
 
 else
-  as_fn_error "libcap header sys/capability.h not found!" "$LINENO" 5
+  as_fn_error $? "libcap header sys/capability.h not found!" "$LINENO" 5
 fi
 
 
@@ -16040,7 +16474,7 @@ $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; };
-		 as_fn_error "dladdr() not supported, required by integrity-test!" "$LINENO" 5
+		 as_fn_error $? "dladdr() not supported, required by integrity-test!" "$LINENO" 5
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -16064,135 +16498,633 @@ $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; };
-		 as_fn_error "dl_iterate_phdr() not supported, required by integrity-test!" "$LINENO" 5
+		 as_fn_error $? "dl_iterate_phdr() not supported, required by integrity-test!" "$LINENO" 5
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 
-libstrongswan_plugins=
-libhydra_plugins=
+# ADD_PLUGIN(plugin, category list)
+# -----------------------------------
+# Append the plugin name $1 to the category list variable $2_plugin
+
+
+
+# plugin lists for all components
+libcharon_plugins=
 pluto_plugins=
+pool_plugins=
+openac_plugins=
+scepclient_plugins=
+pki_plugins=
+scripts_plugins=
+manager_plugins=
+medsrv_plugins=
+
+# location specific lists for checksumming,
+# for src/libcharon, src/pluto, src/libhydra and src/libstrongswan
+c_plugins=
+p_plugins=
+h_plugins=
+s_plugins=
 
 if test x$test_vectors = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" test-vectors"
-	pluto_plugins=${pluto_plugins}" test-vectors"
-fi
+		s_plugins=${s_plugins}" test-vectors"
+		libcharon_plugins=${libcharon_plugins}" test-vectors"
+		pluto_plugins=${pluto_plugins}" test-vectors"
+		openac_plugins=${openac_plugins}" test-vectors"
+		scepclient_plugins=${scepclient_plugins}" test-vectors"
+		pki_plugins=${pki_plugins}" test-vectors"
+
+	fi
+
 if test x$curl = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" curl"
-	pluto_plugins=${pluto_plugins}" curl"
-fi
+		s_plugins=${s_plugins}" curl"
+		libcharon_plugins=${libcharon_plugins}" curl"
+		pluto_plugins=${pluto_plugins}" curl"
+		scepclient_plugins=${scepclient_plugins}" curl"
+
+	fi
+
 if test x$ldap = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" ldap"
-	pluto_plugins=${pluto_plugins}" ldap"
-fi
+		s_plugins=${s_plugins}" ldap"
+		libcharon_plugins=${libcharon_plugins}" ldap"
+		pluto_plugins=${pluto_plugins}" ldap"
+		scepclient_plugins=${scepclient_plugins}" ldap"
+
+	fi
+
+if test x$mysql = xtrue; then
+		s_plugins=${s_plugins}" mysql"
+		libcharon_plugins=${libcharon_plugins}" mysql"
+		pluto_plugins=${pluto_plugins}" mysql"
+		pool_plugins=${pool_plugins}" mysql"
+		manager_plugins=${manager_plugins}" mysql"
+		medsrv_plugins=${medsrv_plugins}" mysql"
+
+	fi
+
+if test x$sqlite = xtrue; then
+		s_plugins=${s_plugins}" sqlite"
+		libcharon_plugins=${libcharon_plugins}" sqlite"
+		pluto_plugins=${pluto_plugins}" sqlite"
+		pool_plugins=${pool_plugins}" sqlite"
+		manager_plugins=${manager_plugins}" sqlite"
+		medsrv_plugins=${medsrv_plugins}" sqlite"
+
+	fi
+
 if test x$aes = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" aes"
-	pluto_plugins=${pluto_plugins}" aes"
-fi
+		s_plugins=${s_plugins}" aes"
+		libcharon_plugins=${libcharon_plugins}" aes"
+		pluto_plugins=${pluto_plugins}" aes"
+		openac_plugins=${openac_plugins}" aes"
+		scepclient_plugins=${scepclient_plugins}" aes"
+		pki_plugins=${pki_plugins}" aes"
+		scripts_plugins=${scripts_plugins}" aes"
+
+	fi
+
 if test x$des = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" des"
-	pluto_plugins=${pluto_plugins}" des"
-fi
+		s_plugins=${s_plugins}" des"
+		libcharon_plugins=${libcharon_plugins}" des"
+		pluto_plugins=${pluto_plugins}" des"
+		openac_plugins=${openac_plugins}" des"
+		scepclient_plugins=${scepclient_plugins}" des"
+		pki_plugins=${pki_plugins}" des"
+		scripts_plugins=${scripts_plugins}" des"
+
+	fi
+
 if test x$blowfish = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" blowfish"
-	pluto_plugins=${pluto_plugins}" blowfish"
-fi
+		s_plugins=${s_plugins}" blowfish"
+		libcharon_plugins=${libcharon_plugins}" blowfish"
+		pluto_plugins=${pluto_plugins}" blowfish"
+		openac_plugins=${openac_plugins}" blowfish"
+		scepclient_plugins=${scepclient_plugins}" blowfish"
+		pki_plugins=${pki_plugins}" blowfish"
+		scripts_plugins=${scripts_plugins}" blowfish"
+
+	fi
+
 if test x$sha1 = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" sha1"
-	pluto_plugins=${pluto_plugins}" sha1"
-fi
+		s_plugins=${s_plugins}" sha1"
+		libcharon_plugins=${libcharon_plugins}" sha1"
+		pluto_plugins=${pluto_plugins}" sha1"
+		openac_plugins=${openac_plugins}" sha1"
+		scepclient_plugins=${scepclient_plugins}" sha1"
+		pki_plugins=${pki_plugins}" sha1"
+		scripts_plugins=${scripts_plugins}" sha1"
+		medsrv_plugins=${medsrv_plugins}" sha1"
+
+	fi
+
 if test x$sha2 = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" sha2"
-	pluto_plugins=${pluto_plugins}" sha2"
-fi
+		s_plugins=${s_plugins}" sha2"
+		libcharon_plugins=${libcharon_plugins}" sha2"
+		pluto_plugins=${pluto_plugins}" sha2"
+		openac_plugins=${openac_plugins}" sha2"
+		scepclient_plugins=${scepclient_plugins}" sha2"
+		pki_plugins=${pki_plugins}" sha2"
+		scripts_plugins=${scripts_plugins}" sha2"
+		medsrv_plugins=${medsrv_plugins}" sha2"
+
+	fi
+
 if test x$md4 = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" md4"
-fi
+		s_plugins=${s_plugins}" md4"
+		libcharon_plugins=${libcharon_plugins}" md4"
+		openac_plugins=${openac_plugins}" md4"
+		manager_plugins=${manager_plugins}" md4"
+		scepclient_plugins=${scepclient_plugins}" md4"
+		pki_plugins=${pki_plugins}" md4"
+
+	fi
+
 if test x$md5 = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" md5"
-	pluto_plugins=${pluto_plugins}" md5"
-fi
+		s_plugins=${s_plugins}" md5"
+		libcharon_plugins=${libcharon_plugins}" md5"
+		pluto_plugins=${pluto_plugins}" md5"
+		openac_plugins=${openac_plugins}" md5"
+		scepclient_plugins=${scepclient_plugins}" md5"
+		pki_plugins=${pki_plugins}" md5"
+
+	fi
+
 if test x$random = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" random"
-	pluto_plugins=${pluto_plugins}" random"
-fi
+		s_plugins=${s_plugins}" random"
+		libcharon_plugins=${libcharon_plugins}" random"
+		pluto_plugins=${pluto_plugins}" random"
+		openac_plugins=${openac_plugins}" random"
+		scepclient_plugins=${scepclient_plugins}" random"
+		pki_plugins=${pki_plugins}" random"
+		scripts_plugins=${scripts_plugins}" random"
+		medsrv_plugins=${medsrv_plugins}" random"
+
+	fi
+
 if test x$x509 = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" x509"
-	pluto_plugins=${pluto_plugins}" x509"
-fi
+		s_plugins=${s_plugins}" x509"
+		libcharon_plugins=${libcharon_plugins}" x509"
+		pluto_plugins=${pluto_plugins}" x509"
+		openac_plugins=${openac_plugins}" x509"
+		scepclient_plugins=${scepclient_plugins}" x509"
+		pki_plugins=${pki_plugins}" x509"
+		scripts_plugins=${scripts_plugins}" x509"
+
+	fi
+
 if test x$revocation = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" revocation"
-fi
+		s_plugins=${s_plugins}" revocation"
+		libcharon_plugins=${libcharon_plugins}" revocation"
+
+	fi
+
 if test x$pubkey = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" pubkey"
-	pluto_plugins=${pluto_plugins}" pubkey"
-fi
+		s_plugins=${s_plugins}" pubkey"
+		libcharon_plugins=${libcharon_plugins}" pubkey"
+
+	fi
+
 if test x$pkcs1 = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" pkcs1"
-	pluto_plugins=${pluto_plugins}" pkcs1"
-fi
+		s_plugins=${s_plugins}" pkcs1"
+		libcharon_plugins=${libcharon_plugins}" pkcs1"
+		pluto_plugins=${pluto_plugins}" pkcs1"
+		openac_plugins=${openac_plugins}" pkcs1"
+		scepclient_plugins=${scepclient_plugins}" pkcs1"
+		pki_plugins=${pki_plugins}" pkcs1"
+		scripts_plugins=${scripts_plugins}" pkcs1"
+		manager_plugins=${manager_plugins}" pkcs1"
+		medsrv_plugins=${medsrv_plugins}" pkcs1"
+
+	fi
+
 if test x$pgp = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" pgp"
-	pluto_plugins=${pluto_plugins}" pgp"
-fi
+		s_plugins=${s_plugins}" pgp"
+		libcharon_plugins=${libcharon_plugins}" pgp"
+		pluto_plugins=${pluto_plugins}" pgp"
+
+	fi
+
 if test x$dnskey = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" dnskey"
-	pluto_plugins=${pluto_plugins}" dnskey"
-fi
+		s_plugins=${s_plugins}" dnskey"
+		pluto_plugins=${pluto_plugins}" dnskey"
+
+	fi
+
 if test x$pem = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" pem"
-	pluto_plugins=${pluto_plugins}" pem"
-fi
-if test x$mysql = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" mysql"
-	pluto_plugins=${pluto_plugins}" mysql"
-fi
-if test x$sqlite = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" sqlite"
-	pluto_plugins=${pluto_plugins}" sqlite"
-fi
+		s_plugins=${s_plugins}" pem"
+		libcharon_plugins=${libcharon_plugins}" pem"
+		pluto_plugins=${pluto_plugins}" pem"
+		openac_plugins=${openac_plugins}" pem"
+		scepclient_plugins=${scepclient_plugins}" pem"
+		pki_plugins=${pki_plugins}" pem"
+		scripts_plugins=${scripts_plugins}" pem"
+		manager_plugins=${manager_plugins}" pem"
+		medsrv_plugins=${medsrv_plugins}" pem"
+
+	fi
+
 if test x$padlock = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" padlock"
-fi
+		s_plugins=${s_plugins}" padlock"
+		libcharon_plugins=${libcharon_plugins}" padlock"
+
+	fi
+
 if test x$openssl = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" openssl"
-	pluto_plugins=${pluto_plugins}" openssl"
-fi
+		s_plugins=${s_plugins}" openssl"
+		libcharon_plugins=${libcharon_plugins}" openssl"
+		pluto_plugins=${pluto_plugins}" openssl"
+		openac_plugins=${openac_plugins}" openssl"
+		scepclient_plugins=${scepclient_plugins}" openssl"
+		pki_plugins=${pki_plugins}" openssl"
+		scripts_plugins=${scripts_plugins}" openssl"
+		manager_plugins=${manager_plugins}" openssl"
+		medsrv_plugins=${medsrv_plugins}" openssl"
+
+	fi
+
 if test x$gcrypt = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" gcrypt"
-	pluto_plugins=${pluto_plugins}" gcrypt"
-fi
+		s_plugins=${s_plugins}" gcrypt"
+		libcharon_plugins=${libcharon_plugins}" gcrypt"
+		pluto_plugins=${pluto_plugins}" gcrypt"
+		openac_plugins=${openac_plugins}" gcrypt"
+		scepclient_plugins=${scepclient_plugins}" gcrypt"
+		pki_plugins=${pki_plugins}" gcrypt"
+		scripts_plugins=${scripts_plugins}" gcrypt"
+		manager_plugins=${manager_plugins}" gcrypt"
+		medsrv_plugins=${medsrv_plugins}" gcrypt"
+
+	fi
+
 if test x$fips_prf = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" fips-prf"
-fi
+		s_plugins=${s_plugins}" fips-prf"
+		libcharon_plugins=${libcharon_plugins}" fips-prf"
+
+	fi
+
+if test x$gmp = xtrue; then
+		s_plugins=${s_plugins}" gmp"
+		libcharon_plugins=${libcharon_plugins}" gmp"
+		pluto_plugins=${pluto_plugins}" gmp"
+		openac_plugins=${openac_plugins}" gmp"
+		scepclient_plugins=${scepclient_plugins}" gmp"
+		pki_plugins=${pki_plugins}" gmp"
+		scripts_plugins=${scripts_plugins}" gmp"
+		manager_plugins=${manager_plugins}" gmp"
+		medsrv_plugins=${medsrv_plugins}" gmp"
+
+	fi
+
+if test x$agent = xtrue; then
+		s_plugins=${s_plugins}" agent"
+		libcharon_plugins=${libcharon_plugins}" agent"
+
+	fi
+
+if test x$pkcs11 = xtrue; then
+		s_plugins=${s_plugins}" pkcs11"
+		libcharon_plugins=${libcharon_plugins}" pkcs11"
+		pki_plugins=${pki_plugins}" pkcs11"
+
+	fi
+
 if test x$xcbc = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" xcbc"
-fi
+		s_plugins=${s_plugins}" xcbc"
+		libcharon_plugins=${libcharon_plugins}" xcbc"
+
+	fi
+
 if test x$hmac = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" hmac"
-	pluto_plugins=${pluto_plugins}" hmac"
-fi
-if test x$agent = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" agent"
-fi
-if test x$gmp = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" gmp"
-	pluto_plugins=${pluto_plugins}" gmp"
-fi
+		s_plugins=${s_plugins}" hmac"
+		libcharon_plugins=${libcharon_plugins}" hmac"
+		pluto_plugins=${pluto_plugins}" hmac"
+		scripts_plugins=${scripts_plugins}" hmac"
+
+	fi
+
+if test x$ctr = xtrue; then
+		s_plugins=${s_plugins}" ctr"
+		libcharon_plugins=${libcharon_plugins}" ctr"
+		scripts_plugins=${scripts_plugins}" ctr"
+
+	fi
+
+if test x$ccm = xtrue; then
+		s_plugins=${s_plugins}" ccm"
+		libcharon_plugins=${libcharon_plugins}" ccm"
+		scripts_plugins=${scripts_plugins}" ccm"
+
+	fi
+
+if test x$gcm = xtrue; then
+		s_plugins=${s_plugins}" gcm"
+		libcharon_plugins=${libcharon_plugins}" gcm"
+		scripts_plugins=${scripts_plugins}" gcm"
+
+	fi
+
 if test x$xauth = xtrue; then
-	pluto_plugins=${pluto_plugins}" xauth"
-fi
+		p_plugins=${p_plugins}" xauth"
+		pluto_plugins=${pluto_plugins}" xauth"
+
+	fi
+
 if test x$attr = xtrue; then
-	libhydra_plugins=${libhydra_plugins}" attr"
-fi
-if test x$attr_sql = xtrue -o x$sql = xtrue; then
-	libhydra_plugins=${libhydra_plugins}" attr-sql"
-fi
+		h_plugins=${h_plugins}" attr"
+		libcharon_plugins=${libcharon_plugins}" attr"
+		pluto_plugins=${pluto_plugins}" attr"
+
+	fi
+
+if test x$attr_sql = xtrue; then
+		h_plugins=${h_plugins}" attr-sql"
+		libcharon_plugins=${libcharon_plugins}" attr-sql"
+		pluto_plugins=${pluto_plugins}" attr-sql"
+
+	fi
+
+if test x$kernel_pfkey = xtrue; then
+		h_plugins=${h_plugins}" kernel-pfkey"
+		libcharon_plugins=${libcharon_plugins}" kernel-pfkey"
+		pluto_plugins=${pluto_plugins}" kernel-pfkey"
+
+	fi
+
+if test x$kernel_pfroute = xtrue; then
+		h_plugins=${h_plugins}" kernel-pfroute"
+		libcharon_plugins=${libcharon_plugins}" kernel-pfroute"
+		pluto_plugins=${pluto_plugins}" kernel-pfroute"
+
+	fi
+
+if test x$kernel_klips = xtrue; then
+		h_plugins=${h_plugins}" kernel-klips"
+		libcharon_plugins=${libcharon_plugins}" kernel-klips"
+		pluto_plugins=${pluto_plugins}" kernel-klips"
+
+	fi
+
+if test x$kernel_netlink = xtrue; then
+		h_plugins=${h_plugins}" kernel-netlink"
+		libcharon_plugins=${libcharon_plugins}" kernel-netlink"
+		pluto_plugins=${pluto_plugins}" kernel-netlink"
+
+	fi
+
 if test x$resolve = xtrue; then
-	libhydra_plugins=${libhydra_plugins}" resolve"
-fi
+		h_plugins=${h_plugins}" resolve"
+		libcharon_plugins=${libcharon_plugins}" resolve"
+		pluto_plugins=${pluto_plugins}" resolve"
+
+	fi
+
+if test x$load_tester = xtrue; then
+		c_plugins=${c_plugins}" load-tester"
+		libcharon_plugins=${libcharon_plugins}" load-tester"
+
+	fi
+
+if test x$socket_default = xtrue; then
+		c_plugins=${c_plugins}" socket-default"
+		libcharon_plugins=${libcharon_plugins}" socket-default"
+
+	fi
+
+if test x$socket_raw = xtrue; then
+		c_plugins=${c_plugins}" socket-raw"
+		libcharon_plugins=${libcharon_plugins}" socket-raw"
+
+	fi
+
+if test x$socket_dynamic = xtrue; then
+		c_plugins=${c_plugins}" socket-dynamic"
+		libcharon_plugins=${libcharon_plugins}" socket-dynamic"
+
+	fi
+
+if test x$farp = xtrue; then
+		c_plugins=${c_plugins}" farp"
+		libcharon_plugins=${libcharon_plugins}" farp"
+
+	fi
+
+if test x$stroke = xtrue; then
+		c_plugins=${c_plugins}" stroke"
+		libcharon_plugins=${libcharon_plugins}" stroke"
+
+	fi
+
+if test x$smp = xtrue; then
+		c_plugins=${c_plugins}" smp"
+		libcharon_plugins=${libcharon_plugins}" smp"
+
+	fi
+
+if test x$sql = xtrue; then
+		c_plugins=${c_plugins}" sql"
+		libcharon_plugins=${libcharon_plugins}" sql"
+
+	fi
+
+if test x$updown = xtrue; then
+		c_plugins=${c_plugins}" updown"
+		libcharon_plugins=${libcharon_plugins}" updown"
+
+	fi
+
+if test x$eap_identity = xtrue; then
+		c_plugins=${c_plugins}" eap-identity"
+		libcharon_plugins=${libcharon_plugins}" eap-identity"
+
+	fi
+
+if test x$eap_sim = xtrue; then
+		c_plugins=${c_plugins}" eap-sim"
+		libcharon_plugins=${libcharon_plugins}" eap-sim"
+
+	fi
+
+if test x$eap_sim_file = xtrue; then
+		c_plugins=${c_plugins}" eap-sim-file"
+		libcharon_plugins=${libcharon_plugins}" eap-sim-file"
+
+	fi
+
+if test x$eap_simaka_sql = xtrue; then
+		c_plugins=${c_plugins}" eap-simaka-sql"
+		libcharon_plugins=${libcharon_plugins}" eap-simaka-sql"
+
+	fi
+
+if test x$eap_simaka_pseudonym = xtrue; then
+		c_plugins=${c_plugins}" eap-simaka-pseudonym"
+		libcharon_plugins=${libcharon_plugins}" eap-simaka-pseudonym"
+
+	fi
+
+if test x$eap_simaka_reauth = xtrue; then
+		c_plugins=${c_plugins}" eap-simaka-reauth"
+		libcharon_plugins=${libcharon_plugins}" eap-simaka-reauth"
+
+	fi
+
+if test x$eap_aka = xtrue; then
+		c_plugins=${c_plugins}" eap-aka"
+		libcharon_plugins=${libcharon_plugins}" eap-aka"
+
+	fi
+
+if test x$eap_aka_3gpp2 = xtrue; then
+		c_plugins=${c_plugins}" eap-aka-3gpp2"
+		libcharon_plugins=${libcharon_plugins}" eap-aka-3gpp2"
+
+	fi
+
+if test x$eap_md5 = xtrue; then
+		c_plugins=${c_plugins}" eap-md5"
+		libcharon_plugins=${libcharon_plugins}" eap-md5"
+
+	fi
+
+if test x$eap_gtc = xtrue; then
+		c_plugins=${c_plugins}" eap-gtc"
+		libcharon_plugins=${libcharon_plugins}" eap-gtc"
+
+	fi
+
+if test x$eap_mschapv2 = xtrue; then
+		c_plugins=${c_plugins}" eap-mschapv2"
+		libcharon_plugins=${libcharon_plugins}" eap-mschapv2"
+
+	fi
+
+if test x$eap_radius = xtrue; then
+		c_plugins=${c_plugins}" eap-radius"
+		libcharon_plugins=${libcharon_plugins}" eap-radius"
+
+	fi
+
+if test x$eap_tls = xtrue; then
+		c_plugins=${c_plugins}" eap-tls"
+		libcharon_plugins=${libcharon_plugins}" eap-tls"
+
+	fi
+
+if test x$eap_ttls = xtrue; then
+		c_plugins=${c_plugins}" eap-ttls"
+		libcharon_plugins=${libcharon_plugins}" eap-ttls"
+
+	fi
+
+if test x$eap_tnc = xtrue; then
+		c_plugins=${c_plugins}" eap-tnc"
+		libcharon_plugins=${libcharon_plugins}" eap-tnc"
+
+	fi
+
+if test x$tnc_imc = xtrue; then
+		c_plugins=${c_plugins}" tnc-imc"
+		libcharon_plugins=${libcharon_plugins}" tnc-imc"
+
+	fi
+
+if test x$tnc_imv = xtrue; then
+		c_plugins=${c_plugins}" tnc-imv"
+		libcharon_plugins=${libcharon_plugins}" tnc-imv"
+
+	fi
+
+if test x$tnccs_11 = xtrue; then
+		c_plugins=${c_plugins}" tnccs-11"
+		libcharon_plugins=${libcharon_plugins}" tnccs-11"
+
+	fi
+
+if test x$tnccs_20 = xtrue; then
+		c_plugins=${c_plugins}" tnccs-20"
+		libcharon_plugins=${libcharon_plugins}" tnccs-20"
+
+	fi
+
+if test x$medsrv = xtrue; then
+		c_plugins=${c_plugins}" medsrv"
+		libcharon_plugins=${libcharon_plugins}" medsrv"
+
+	fi
+
+if test x$medcli = xtrue; then
+		c_plugins=${c_plugins}" medcli"
+		libcharon_plugins=${libcharon_plugins}" medcli"
+
+	fi
+
+if test x$nm = xtrue; then
+		c_plugins=${c_plugins}" nm"
+		libcharon_plugins=${libcharon_plugins}" nm"
+
+	fi
+
+if test x$dhcp = xtrue; then
+		c_plugins=${c_plugins}" dhcp"
+		libcharon_plugins=${libcharon_plugins}" dhcp"
+
+	fi
+
+if test x$android = xtrue; then
+		c_plugins=${c_plugins}" android"
+		libcharon_plugins=${libcharon_plugins}" android"
+
+	fi
+
+if test x$ha = xtrue; then
+		c_plugins=${c_plugins}" ha"
+		libcharon_plugins=${libcharon_plugins}" ha"
+
+	fi
+
+if test x$led = xtrue; then
+		c_plugins=${c_plugins}" led"
+		libcharon_plugins=${libcharon_plugins}" led"
+
+	fi
+
+if test x$maemo = xtrue; then
+		c_plugins=${c_plugins}" maemo"
+		libcharon_plugins=${libcharon_plugins}" maemo"
+
+	fi
+
+if test x$uci = xtrue; then
+		c_plugins=${c_plugins}" uci"
+		libcharon_plugins=${libcharon_plugins}" uci"
+
+	fi
+
+if test x$addrblock = xtrue; then
+		c_plugins=${c_plugins}" addrblock"
+		libcharon_plugins=${libcharon_plugins}" addrblock"
+
+	fi
+
+if test x$unit_tester = xtrue; then
+		c_plugins=${c_plugins}" unit-tester"
+		libcharon_plugins=${libcharon_plugins}" unit-tester"
+
+	fi
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -16423,6 +17355,38 @@ else
   USE_AGENT_FALSE=
 fi
 
+ if test x$pkcs11 = xtrue; then
+  USE_PKCS11_TRUE=
+  USE_PKCS11_FALSE='#'
+else
+  USE_PKCS11_TRUE='#'
+  USE_PKCS11_FALSE=
+fi
+
+ if test x$ctr = xtrue; then
+  USE_CTR_TRUE=
+  USE_CTR_FALSE='#'
+else
+  USE_CTR_TRUE='#'
+  USE_CTR_FALSE=
+fi
+
+ if test x$ccm = xtrue; then
+  USE_CCM_TRUE=
+  USE_CCM_FALSE='#'
+else
+  USE_CCM_TRUE='#'
+  USE_CCM_FALSE=
+fi
+
+ if test x$gcm = xtrue; then
+  USE_GCM_TRUE=
+  USE_GCM_FALSE='#'
+else
+  USE_GCM_TRUE='#'
+  USE_GCM_FALSE=
+fi
+
 
  if test x$stroke = xtrue; then
   USE_STROKE_TRUE=
@@ -16472,6 +17436,14 @@ else
   USE_ANDROID_FALSE=
 fi
 
+ if test x$maemo = xtrue; then
+  USE_MAEMO_TRUE=
+  USE_MAEMO_FALSE='#'
+else
+  USE_MAEMO_TRUE='#'
+  USE_MAEMO_FALSE=
+fi
+
  if test x$smp = xtrue; then
   USE_SMP_TRUE=
   USE_SMP_FALSE='#'
@@ -16528,6 +17500,14 @@ else
   USE_HA_FALSE=
 fi
 
+ if test x$led = xtrue; then
+  USE_LED_TRUE=
+  USE_LED_FALSE='#'
+else
+  USE_LED_TRUE='#'
+  USE_LED_FALSE=
+fi
+
  if test x$eap_sim = xtrue; then
   USE_EAP_SIM_TRUE=
   USE_EAP_SIM_FALSE='#'
@@ -16616,6 +17596,30 @@ else
   USE_EAP_MSCHAPV2_FALSE=
 fi
 
+ if test x$eap_tls = xtrue; then
+  USE_EAP_TLS_TRUE=
+  USE_EAP_TLS_FALSE='#'
+else
+  USE_EAP_TLS_TRUE='#'
+  USE_EAP_TLS_FALSE=
+fi
+
+ if test x$eap_ttls = xtrue; then
+  USE_EAP_TTLS_TRUE=
+  USE_EAP_TTLS_FALSE='#'
+else
+  USE_EAP_TTLS_TRUE='#'
+  USE_EAP_TTLS_FALSE=
+fi
+
+ if test x$eap_tnc = xtrue; then
+  USE_EAP_TNC_TRUE=
+  USE_EAP_TNC_FALSE='#'
+else
+  USE_EAP_TNC_TRUE='#'
+  USE_EAP_TNC_FALSE=
+fi
+
  if test x$eap_radius = xtrue; then
   USE_EAP_RADIUS_TRUE=
   USE_EAP_RADIUS_FALSE='#'
@@ -16624,36 +17628,36 @@ else
   USE_EAP_RADIUS_FALSE=
 fi
 
- if test x$kernel_netlink = xtrue; then
-  USE_KERNEL_NETLINK_TRUE=
-  USE_KERNEL_NETLINK_FALSE='#'
+ if test x$tnc_imc = xtrue; then
+  USE_TNC_IMC_TRUE=
+  USE_TNC_IMC_FALSE='#'
 else
-  USE_KERNEL_NETLINK_TRUE='#'
-  USE_KERNEL_NETLINK_FALSE=
+  USE_TNC_IMC_TRUE='#'
+  USE_TNC_IMC_FALSE=
 fi
 
- if test x$kernel_pfkey = xtrue; then
-  USE_KERNEL_PFKEY_TRUE=
-  USE_KERNEL_PFKEY_FALSE='#'
+ if test x$tnc_imv = xtrue; then
+  USE_TNC_IMV_TRUE=
+  USE_TNC_IMV_FALSE='#'
 else
-  USE_KERNEL_PFKEY_TRUE='#'
-  USE_KERNEL_PFKEY_FALSE=
+  USE_TNC_IMV_TRUE='#'
+  USE_TNC_IMV_FALSE=
 fi
 
- if test x$kernel_pfroute = xtrue; then
-  USE_KERNEL_PFROUTE_TRUE=
-  USE_KERNEL_PFROUTE_FALSE='#'
+ if test x$tnccs_11 = xtrue; then
+  USE_TNCCS_11_TRUE=
+  USE_TNCCS_11_FALSE='#'
 else
-  USE_KERNEL_PFROUTE_TRUE='#'
-  USE_KERNEL_PFROUTE_FALSE=
+  USE_TNCCS_11_TRUE='#'
+  USE_TNCCS_11_FALSE=
 fi
 
- if test x$kernel_klips = xtrue; then
-  USE_KERNEL_KLIPS_TRUE=
-  USE_KERNEL_KLIPS_FALSE='#'
+ if test x$tnccs_20 = xtrue; then
+  USE_TNCCS_20_TRUE=
+  USE_TNCCS_20_FALSE='#'
 else
-  USE_KERNEL_KLIPS_TRUE='#'
-  USE_KERNEL_KLIPS_FALSE=
+  USE_TNCCS_20_TRUE='#'
+  USE_TNCCS_20_FALSE=
 fi
 
  if test x$socket_default = xtrue; then
@@ -16713,6 +17717,38 @@ else
   USE_ATTR_SQL_FALSE=
 fi
 
+ if test x$kernel_klips = xtrue; then
+  USE_KERNEL_KLIPS_TRUE=
+  USE_KERNEL_KLIPS_FALSE='#'
+else
+  USE_KERNEL_KLIPS_TRUE='#'
+  USE_KERNEL_KLIPS_FALSE=
+fi
+
+ if test x$kernel_netlink = xtrue; then
+  USE_KERNEL_NETLINK_TRUE=
+  USE_KERNEL_NETLINK_FALSE='#'
+else
+  USE_KERNEL_NETLINK_TRUE='#'
+  USE_KERNEL_NETLINK_FALSE=
+fi
+
+ if test x$kernel_pfkey = xtrue; then
+  USE_KERNEL_PFKEY_TRUE=
+  USE_KERNEL_PFKEY_FALSE='#'
+else
+  USE_KERNEL_PFKEY_TRUE='#'
+  USE_KERNEL_PFKEY_FALSE=
+fi
+
+ if test x$kernel_pfroute = xtrue; then
+  USE_KERNEL_PFROUTE_TRUE=
+  USE_KERNEL_PFROUTE_FALSE='#'
+else
+  USE_KERNEL_PFROUTE_TRUE='#'
+  USE_KERNEL_PFROUTE_FALSE=
+fi
+
  if test x$resolve = xtrue; then
   USE_RESOLVE_TRUE=
   USE_RESOLVE_FALSE='#'
@@ -16923,6 +17959,14 @@ else
   USE_SIMAKA_FALSE=
 fi
 
+ if test x$tls = xtrue; then
+  USE_TLS_TRUE=
+  USE_TLS_FALSE='#'
+else
+  USE_TLS_TRUE='#'
+  USE_TLS_FALSE=
+fi
+
  if test x$monolithic = xtrue; then
   MONOLITHIC_TRUE=
   MONOLITHIC_FALSE='#'
@@ -16948,7 +17992,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/include/Makefile src/libstrongswan/Makefile src/libstrongswan/plugins/aes/Makefile src/libstrongswan/plugins/des/Makefile src/libstrongswan/plugins/blowfish/Makefile src/libstrongswan/plugins/md4/Makefile src/libstrongswan/plugins/md5/Makefile src/libstrongswan/plugins/sha1/Makefile src/libstrongswan/plugins/sha2/Makefile src/libstrongswan/plugins/fips_prf/Makefile src/libstrongswan/plugins/gmp/Makefile src/libstrongswan/plugins/random/Makefile src/libstrongswan/plugins/hmac/Makefile src/libstrongswan/plugins/xcbc/Makefile src/libstrongswan/plugins/x509/Makefile src/libstrongswan/plugins/revocation/Makefile src/libstrongswan/plugins/pubkey/Makefile src/libstrongswan/plugins/pkcs1/Makefile src/libstrongswan/plugins/pgp/Makefile src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/Makefile src/libstrongswan/plugins/ldap/Makefile src/libstrongswan/plugins/mysql/Makefile src/libstrongswan/plugins/sqlite/Makefile src/libstrongswan/plugins/padlock/Makefile src/libstrongswan/plugins/openssl/Makefile src/libstrongswan/plugins/gcrypt/Makefile src/libstrongswan/plugins/agent/Makefile src/libstrongswan/plugins/test_vectors/Makefile src/libhydra/Makefile src/libhydra/plugins/attr/Makefile src/libhydra/plugins/attr_sql/Makefile src/libhydra/plugins/resolve/Makefile src/libfreeswan/Makefile src/libsimaka/Makefile src/pluto/Makefile src/pluto/plugins/xauth/Makefile src/whack/Makefile src/charon/Makefile src/libcharon/Makefile src/libcharon/plugins/eap_aka/Makefile src/libcharon/plugins/eap_aka_3gpp2/Makefile src/libcharon/plugins/eap_identity/Makefile src/libcharon/plugins/eap_md5/Makefile src/libcharon/plugins/eap_gtc/Makefile src/libcharon/plugins/eap_sim/Makefile src/libcharon/plugins/eap_sim_file/Makefile src/libcharon/plugins/eap_simaka_sql/Makefile src/libcharon/plugins/eap_simaka_pseudonym/Makefile src/libcharon/plugins/eap_simaka_reauth/Makefile src/libcharon/plugins/eap_mschapv2/Makefile src/libcharon/plugins/eap_radius/Makefile src/libcharon/plugins/kernel_netlink/Makefile src/libcharon/plugins/kernel_pfkey/Makefile src/libcharon/plugins/kernel_pfroute/Makefile src/libcharon/plugins/kernel_klips/Makefile src/libcharon/plugins/socket_default/Makefile src/libcharon/plugins/socket_raw/Makefile src/libcharon/plugins/socket_dynamic/Makefile src/libcharon/plugins/farp/Makefile src/libcharon/plugins/smp/Makefile src/libcharon/plugins/sql/Makefile src/libcharon/plugins/medsrv/Makefile src/libcharon/plugins/medcli/Makefile src/libcharon/plugins/nm/Makefile src/libcharon/plugins/addrblock/Makefile src/libcharon/plugins/uci/Makefile src/libcharon/plugins/ha/Makefile src/libcharon/plugins/android/Makefile src/libcharon/plugins/stroke/Makefile src/libcharon/plugins/updown/Makefile src/libcharon/plugins/dhcp/Makefile src/libcharon/plugins/unit_tester/Makefile src/libcharon/plugins/load_tester/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/pki/Makefile src/dumm/Makefile src/dumm/ext/extconf.rb src/libfast/Makefile src/manager/Makefile src/medsrv/Makefile src/checksum/Makefile scripts/Makefile testing/Makefile"
+ac_config_files="$ac_config_files Makefile man/Makefile src/Makefile src/include/Makefile src/libstrongswan/Makefile src/libstrongswan/plugins/aes/Makefile src/libstrongswan/plugins/des/Makefile src/libstrongswan/plugins/blowfish/Makefile src/libstrongswan/plugins/md4/Makefile src/libstrongswan/plugins/md5/Makefile src/libstrongswan/plugins/sha1/Makefile src/libstrongswan/plugins/sha2/Makefile src/libstrongswan/plugins/fips_prf/Makefile src/libstrongswan/plugins/gmp/Makefile src/libstrongswan/plugins/random/Makefile src/libstrongswan/plugins/hmac/Makefile src/libstrongswan/plugins/xcbc/Makefile src/libstrongswan/plugins/x509/Makefile src/libstrongswan/plugins/revocation/Makefile src/libstrongswan/plugins/pubkey/Makefile src/libstrongswan/plugins/pkcs1/Makefile src/libstrongswan/plugins/pgp/Makefile src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/Makefile src/libstrongswan/plugins/ldap/Makefile src/libstrongswan/plugins/mysql/Makefile src/libstrongswan/plugins/sqlite/Makefile src/libstrongswan/plugins/padlock/Makefile src/libstrongswan/plugins/openssl/Makefile src/libstrongswan/plugins/gcrypt/Makefile src/libstrongswan/plugins/agent/Makefile src/libstrongswan/plugins/pkcs11/Makefile src/libstrongswan/plugins/ctr/Makefile src/libstrongswan/plugins/ccm/Makefile src/libstrongswan/plugins/gcm/Makefile src/libstrongswan/plugins/test_vectors/Makefile src/libhydra/Makefile src/libhydra/plugins/attr/Makefile src/libhydra/plugins/attr_sql/Makefile src/libhydra/plugins/kernel_klips/Makefile src/libhydra/plugins/kernel_netlink/Makefile src/libhydra/plugins/kernel_pfkey/Makefile src/libhydra/plugins/kernel_pfroute/Makefile src/libhydra/plugins/resolve/Makefile src/libfreeswan/Makefile src/libsimaka/Makefile src/libtls/Makefile src/pluto/Makefile src/pluto/plugins/xauth/Makefile src/whack/Makefile src/charon/Makefile src/libcharon/Makefile src/libcharon/plugins/eap_aka/Makefile src/libcharon/plugins/eap_aka_3gpp2/Makefile src/libcharon/plugins/eap_identity/Makefile src/libcharon/plugins/eap_md5/Makefile src/libcharon/plugins/eap_gtc/Makefile src/libcharon/plugins/eap_sim/Makefile src/libcharon/plugins/eap_sim_file/Makefile src/libcharon/plugins/eap_simaka_sql/Makefile src/libcharon/plugins/eap_simaka_pseudonym/Makefile src/libcharon/plugins/eap_simaka_reauth/Makefile src/libcharon/plugins/eap_mschapv2/Makefile src/libcharon/plugins/eap_tls/Makefile src/libcharon/plugins/eap_ttls/Makefile src/libcharon/plugins/eap_tnc/Makefile src/libcharon/plugins/eap_radius/Makefile src/libcharon/plugins/tnc_imc/Makefile src/libcharon/plugins/tnc_imv/Makefile src/libcharon/plugins/tnccs_11/Makefile src/libcharon/plugins/tnccs_20/Makefile src/libcharon/plugins/socket_default/Makefile src/libcharon/plugins/socket_raw/Makefile src/libcharon/plugins/socket_dynamic/Makefile src/libcharon/plugins/farp/Makefile src/libcharon/plugins/smp/Makefile src/libcharon/plugins/sql/Makefile src/libcharon/plugins/medsrv/Makefile src/libcharon/plugins/medcli/Makefile src/libcharon/plugins/nm/Makefile src/libcharon/plugins/addrblock/Makefile src/libcharon/plugins/uci/Makefile src/libcharon/plugins/ha/Makefile src/libcharon/plugins/led/Makefile src/libcharon/plugins/android/Makefile src/libcharon/plugins/maemo/Makefile src/libcharon/plugins/stroke/Makefile src/libcharon/plugins/updown/Makefile src/libcharon/plugins/dhcp/Makefile src/libcharon/plugins/unit_tester/Makefile src/libcharon/plugins/load_tester/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/pki/Makefile src/dumm/Makefile src/dumm/ext/extconf.rb src/libfast/Makefile src/manager/Makefile src/medsrv/Makefile src/checksum/Makefile scripts/Makefile testing/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17069,6 +18113,7 @@ DEFS=`sed -n "$ac_script" confdefs.h`
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -17092,376 +18137,432 @@ else
 fi
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 if test -z "${USE_TEST_VECTORS_TRUE}" && test -z "${USE_TEST_VECTORS_FALSE}"; then
-  as_fn_error "conditional \"USE_TEST_VECTORS\" was never defined.
+  as_fn_error $? "conditional \"USE_TEST_VECTORS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_CURL_TRUE}" && test -z "${USE_CURL_FALSE}"; then
-  as_fn_error "conditional \"USE_CURL\" was never defined.
+  as_fn_error $? "conditional \"USE_CURL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_LDAP_TRUE}" && test -z "${USE_LDAP_FALSE}"; then
-  as_fn_error "conditional \"USE_LDAP\" was never defined.
+  as_fn_error $? "conditional \"USE_LDAP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_AES_TRUE}" && test -z "${USE_AES_FALSE}"; then
-  as_fn_error "conditional \"USE_AES\" was never defined.
+  as_fn_error $? "conditional \"USE_AES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_DES_TRUE}" && test -z "${USE_DES_FALSE}"; then
-  as_fn_error "conditional \"USE_DES\" was never defined.
+  as_fn_error $? "conditional \"USE_DES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_BLOWFISH_TRUE}" && test -z "${USE_BLOWFISH_FALSE}"; then
-  as_fn_error "conditional \"USE_BLOWFISH\" was never defined.
+  as_fn_error $? "conditional \"USE_BLOWFISH\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_MD4_TRUE}" && test -z "${USE_MD4_FALSE}"; then
-  as_fn_error "conditional \"USE_MD4\" was never defined.
+  as_fn_error $? "conditional \"USE_MD4\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_MD5_TRUE}" && test -z "${USE_MD5_FALSE}"; then
-  as_fn_error "conditional \"USE_MD5\" was never defined.
+  as_fn_error $? "conditional \"USE_MD5\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_SHA1_TRUE}" && test -z "${USE_SHA1_FALSE}"; then
-  as_fn_error "conditional \"USE_SHA1\" was never defined.
+  as_fn_error $? "conditional \"USE_SHA1\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_SHA2_TRUE}" && test -z "${USE_SHA2_FALSE}"; then
-  as_fn_error "conditional \"USE_SHA2\" was never defined.
+  as_fn_error $? "conditional \"USE_SHA2\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_FIPS_PRF_TRUE}" && test -z "${USE_FIPS_PRF_FALSE}"; then
-  as_fn_error "conditional \"USE_FIPS_PRF\" was never defined.
+  as_fn_error $? "conditional \"USE_FIPS_PRF\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_GMP_TRUE}" && test -z "${USE_GMP_FALSE}"; then
-  as_fn_error "conditional \"USE_GMP\" was never defined.
+  as_fn_error $? "conditional \"USE_GMP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_RANDOM_TRUE}" && test -z "${USE_RANDOM_FALSE}"; then
-  as_fn_error "conditional \"USE_RANDOM\" was never defined.
+  as_fn_error $? "conditional \"USE_RANDOM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_X509_TRUE}" && test -z "${USE_X509_FALSE}"; then
-  as_fn_error "conditional \"USE_X509\" was never defined.
+  as_fn_error $? "conditional \"USE_X509\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_REVOCATION_TRUE}" && test -z "${USE_REVOCATION_FALSE}"; then
-  as_fn_error "conditional \"USE_REVOCATION\" was never defined.
+  as_fn_error $? "conditional \"USE_REVOCATION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_PUBKEY_TRUE}" && test -z "${USE_PUBKEY_FALSE}"; then
-  as_fn_error "conditional \"USE_PUBKEY\" was never defined.
+  as_fn_error $? "conditional \"USE_PUBKEY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_PKCS1_TRUE}" && test -z "${USE_PKCS1_FALSE}"; then
-  as_fn_error "conditional \"USE_PKCS1\" was never defined.
+  as_fn_error $? "conditional \"USE_PKCS1\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_PGP_TRUE}" && test -z "${USE_PGP_FALSE}"; then
-  as_fn_error "conditional \"USE_PGP\" was never defined.
+  as_fn_error $? "conditional \"USE_PGP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_DNSKEY_TRUE}" && test -z "${USE_DNSKEY_FALSE}"; then
-  as_fn_error "conditional \"USE_DNSKEY\" was never defined.
+  as_fn_error $? "conditional \"USE_DNSKEY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_PEM_TRUE}" && test -z "${USE_PEM_FALSE}"; then
-  as_fn_error "conditional \"USE_PEM\" was never defined.
+  as_fn_error $? "conditional \"USE_PEM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_HMAC_TRUE}" && test -z "${USE_HMAC_FALSE}"; then
-  as_fn_error "conditional \"USE_HMAC\" was never defined.
+  as_fn_error $? "conditional \"USE_HMAC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_XCBC_TRUE}" && test -z "${USE_XCBC_FALSE}"; then
-  as_fn_error "conditional \"USE_XCBC\" was never defined.
+  as_fn_error $? "conditional \"USE_XCBC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_MYSQL_TRUE}" && test -z "${USE_MYSQL_FALSE}"; then
-  as_fn_error "conditional \"USE_MYSQL\" was never defined.
+  as_fn_error $? "conditional \"USE_MYSQL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_SQLITE_TRUE}" && test -z "${USE_SQLITE_FALSE}"; then
-  as_fn_error "conditional \"USE_SQLITE\" was never defined.
+  as_fn_error $? "conditional \"USE_SQLITE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_PADLOCK_TRUE}" && test -z "${USE_PADLOCK_FALSE}"; then
-  as_fn_error "conditional \"USE_PADLOCK\" was never defined.
+  as_fn_error $? "conditional \"USE_PADLOCK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_OPENSSL_TRUE}" && test -z "${USE_OPENSSL_FALSE}"; then
-  as_fn_error "conditional \"USE_OPENSSL\" was never defined.
+  as_fn_error $? "conditional \"USE_OPENSSL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_GCRYPT_TRUE}" && test -z "${USE_GCRYPT_FALSE}"; then
-  as_fn_error "conditional \"USE_GCRYPT\" was never defined.
+  as_fn_error $? "conditional \"USE_GCRYPT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_AGENT_TRUE}" && test -z "${USE_AGENT_FALSE}"; then
-  as_fn_error "conditional \"USE_AGENT\" was never defined.
+  as_fn_error $? "conditional \"USE_AGENT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_PKCS11_TRUE}" && test -z "${USE_PKCS11_FALSE}"; then
+  as_fn_error $? "conditional \"USE_PKCS11\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_CTR_TRUE}" && test -z "${USE_CTR_FALSE}"; then
+  as_fn_error $? "conditional \"USE_CTR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_CCM_TRUE}" && test -z "${USE_CCM_FALSE}"; then
+  as_fn_error $? "conditional \"USE_CCM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_GCM_TRUE}" && test -z "${USE_GCM_FALSE}"; then
+  as_fn_error $? "conditional \"USE_GCM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_STROKE_TRUE}" && test -z "${USE_STROKE_FALSE}"; then
-  as_fn_error "conditional \"USE_STROKE\" was never defined.
+  as_fn_error $? "conditional \"USE_STROKE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_MEDSRV_TRUE}" && test -z "${USE_MEDSRV_FALSE}"; then
-  as_fn_error "conditional \"USE_MEDSRV\" was never defined.
+  as_fn_error $? "conditional \"USE_MEDSRV\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_MEDCLI_TRUE}" && test -z "${USE_MEDCLI_FALSE}"; then
-  as_fn_error "conditional \"USE_MEDCLI\" was never defined.
+  as_fn_error $? "conditional \"USE_MEDCLI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_NM_TRUE}" && test -z "${USE_NM_FALSE}"; then
-  as_fn_error "conditional \"USE_NM\" was never defined.
+  as_fn_error $? "conditional \"USE_NM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_UCI_TRUE}" && test -z "${USE_UCI_FALSE}"; then
-  as_fn_error "conditional \"USE_UCI\" was never defined.
+  as_fn_error $? "conditional \"USE_UCI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_ANDROID_TRUE}" && test -z "${USE_ANDROID_FALSE}"; then
-  as_fn_error "conditional \"USE_ANDROID\" was never defined.
+  as_fn_error $? "conditional \"USE_ANDROID\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_MAEMO_TRUE}" && test -z "${USE_MAEMO_FALSE}"; then
+  as_fn_error $? "conditional \"USE_MAEMO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_SMP_TRUE}" && test -z "${USE_SMP_FALSE}"; then
-  as_fn_error "conditional \"USE_SMP\" was never defined.
+  as_fn_error $? "conditional \"USE_SMP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_SQL_TRUE}" && test -z "${USE_SQL_FALSE}"; then
-  as_fn_error "conditional \"USE_SQL\" was never defined.
+  as_fn_error $? "conditional \"USE_SQL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_UPDOWN_TRUE}" && test -z "${USE_UPDOWN_FALSE}"; then
-  as_fn_error "conditional \"USE_UPDOWN\" was never defined.
+  as_fn_error $? "conditional \"USE_UPDOWN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_DHCP_TRUE}" && test -z "${USE_DHCP_FALSE}"; then
-  as_fn_error "conditional \"USE_DHCP\" was never defined.
+  as_fn_error $? "conditional \"USE_DHCP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_UNIT_TESTS_TRUE}" && test -z "${USE_UNIT_TESTS_FALSE}"; then
-  as_fn_error "conditional \"USE_UNIT_TESTS\" was never defined.
+  as_fn_error $? "conditional \"USE_UNIT_TESTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_LOAD_TESTER_TRUE}" && test -z "${USE_LOAD_TESTER_FALSE}"; then
-  as_fn_error "conditional \"USE_LOAD_TESTER\" was never defined.
+  as_fn_error $? "conditional \"USE_LOAD_TESTER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_HA_TRUE}" && test -z "${USE_HA_FALSE}"; then
-  as_fn_error "conditional \"USE_HA\" was never defined.
+  as_fn_error $? "conditional \"USE_HA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_LED_TRUE}" && test -z "${USE_LED_FALSE}"; then
+  as_fn_error $? "conditional \"USE_LED\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_EAP_SIM_TRUE}" && test -z "${USE_EAP_SIM_FALSE}"; then
-  as_fn_error "conditional \"USE_EAP_SIM\" was never defined.
+  as_fn_error $? "conditional \"USE_EAP_SIM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_EAP_SIM_FILE_TRUE}" && test -z "${USE_EAP_SIM_FILE_FALSE}"; then
-  as_fn_error "conditional \"USE_EAP_SIM_FILE\" was never defined.
+  as_fn_error $? "conditional \"USE_EAP_SIM_FILE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_EAP_SIMAKA_SQL_TRUE}" && test -z "${USE_EAP_SIMAKA_SQL_FALSE}"; then
-  as_fn_error "conditional \"USE_EAP_SIMAKA_SQL\" was never defined.
+  as_fn_error $? "conditional \"USE_EAP_SIMAKA_SQL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_EAP_SIMAKA_PSEUDONYM_TRUE}" && test -z "${USE_EAP_SIMAKA_PSEUDONYM_FALSE}"; then
-  as_fn_error "conditional \"USE_EAP_SIMAKA_PSEUDONYM\" was never defined.
+  as_fn_error $? "conditional \"USE_EAP_SIMAKA_PSEUDONYM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_EAP_SIMAKA_REAUTH_TRUE}" && test -z "${USE_EAP_SIMAKA_REAUTH_FALSE}"; then
-  as_fn_error "conditional \"USE_EAP_SIMAKA_REAUTH\" was never defined.
+  as_fn_error $? "conditional \"USE_EAP_SIMAKA_REAUTH\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_EAP_IDENTITY_TRUE}" && test -z "${USE_EAP_IDENTITY_FALSE}"; then
-  as_fn_error "conditional \"USE_EAP_IDENTITY\" was never defined.
+  as_fn_error $? "conditional \"USE_EAP_IDENTITY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_EAP_MD5_TRUE}" && test -z "${USE_EAP_MD5_FALSE}"; then
-  as_fn_error "conditional \"USE_EAP_MD5\" was never defined.
+  as_fn_error $? "conditional \"USE_EAP_MD5\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_EAP_GTC_TRUE}" && test -z "${USE_EAP_GTC_FALSE}"; then
-  as_fn_error "conditional \"USE_EAP_GTC\" was never defined.
+  as_fn_error $? "conditional \"USE_EAP_GTC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_EAP_AKA_TRUE}" && test -z "${USE_EAP_AKA_FALSE}"; then
-  as_fn_error "conditional \"USE_EAP_AKA\" was never defined.
+  as_fn_error $? "conditional \"USE_EAP_AKA\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_EAP_AKA_3GPP2_TRUE}" && test -z "${USE_EAP_AKA_3GPP2_FALSE}"; then
-  as_fn_error "conditional \"USE_EAP_AKA_3GPP2\" was never defined.
+  as_fn_error $? "conditional \"USE_EAP_AKA_3GPP2\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_EAP_MSCHAPV2_TRUE}" && test -z "${USE_EAP_MSCHAPV2_FALSE}"; then
-  as_fn_error "conditional \"USE_EAP_MSCHAPV2\" was never defined.
+  as_fn_error $? "conditional \"USE_EAP_MSCHAPV2\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_EAP_TLS_TRUE}" && test -z "${USE_EAP_TLS_FALSE}"; then
+  as_fn_error $? "conditional \"USE_EAP_TLS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_EAP_TTLS_TRUE}" && test -z "${USE_EAP_TTLS_FALSE}"; then
+  as_fn_error $? "conditional \"USE_EAP_TTLS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_EAP_TNC_TRUE}" && test -z "${USE_EAP_TNC_FALSE}"; then
+  as_fn_error $? "conditional \"USE_EAP_TNC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_EAP_RADIUS_TRUE}" && test -z "${USE_EAP_RADIUS_FALSE}"; then
-  as_fn_error "conditional \"USE_EAP_RADIUS\" was never defined.
+  as_fn_error $? "conditional \"USE_EAP_RADIUS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${USE_KERNEL_NETLINK_TRUE}" && test -z "${USE_KERNEL_NETLINK_FALSE}"; then
-  as_fn_error "conditional \"USE_KERNEL_NETLINK\" was never defined.
+if test -z "${USE_TNC_IMC_TRUE}" && test -z "${USE_TNC_IMC_FALSE}"; then
+  as_fn_error $? "conditional \"USE_TNC_IMC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${USE_KERNEL_PFKEY_TRUE}" && test -z "${USE_KERNEL_PFKEY_FALSE}"; then
-  as_fn_error "conditional \"USE_KERNEL_PFKEY\" was never defined.
+if test -z "${USE_TNC_IMV_TRUE}" && test -z "${USE_TNC_IMV_FALSE}"; then
+  as_fn_error $? "conditional \"USE_TNC_IMV\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${USE_KERNEL_PFROUTE_TRUE}" && test -z "${USE_KERNEL_PFROUTE_FALSE}"; then
-  as_fn_error "conditional \"USE_KERNEL_PFROUTE\" was never defined.
+if test -z "${USE_TNCCS_11_TRUE}" && test -z "${USE_TNCCS_11_FALSE}"; then
+  as_fn_error $? "conditional \"USE_TNCCS_11\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${USE_KERNEL_KLIPS_TRUE}" && test -z "${USE_KERNEL_KLIPS_FALSE}"; then
-  as_fn_error "conditional \"USE_KERNEL_KLIPS\" was never defined.
+if test -z "${USE_TNCCS_20_TRUE}" && test -z "${USE_TNCCS_20_FALSE}"; then
+  as_fn_error $? "conditional \"USE_TNCCS_20\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_SOCKET_DEFAULT_TRUE}" && test -z "${USE_SOCKET_DEFAULT_FALSE}"; then
-  as_fn_error "conditional \"USE_SOCKET_DEFAULT\" was never defined.
+  as_fn_error $? "conditional \"USE_SOCKET_DEFAULT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_SOCKET_RAW_TRUE}" && test -z "${USE_SOCKET_RAW_FALSE}"; then
-  as_fn_error "conditional \"USE_SOCKET_RAW\" was never defined.
+  as_fn_error $? "conditional \"USE_SOCKET_RAW\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_SOCKET_DYNAMIC_TRUE}" && test -z "${USE_SOCKET_DYNAMIC_FALSE}"; then
-  as_fn_error "conditional \"USE_SOCKET_DYNAMIC\" was never defined.
+  as_fn_error $? "conditional \"USE_SOCKET_DYNAMIC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_FARP_TRUE}" && test -z "${USE_FARP_FALSE}"; then
-  as_fn_error "conditional \"USE_FARP\" was never defined.
+  as_fn_error $? "conditional \"USE_FARP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_ADDRBLOCK_TRUE}" && test -z "${USE_ADDRBLOCK_FALSE}"; then
-  as_fn_error "conditional \"USE_ADDRBLOCK\" was never defined.
+  as_fn_error $? "conditional \"USE_ADDRBLOCK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_ATTR_TRUE}" && test -z "${USE_ATTR_FALSE}"; then
-  as_fn_error "conditional \"USE_ATTR\" was never defined.
+  as_fn_error $? "conditional \"USE_ATTR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_ATTR_SQL_TRUE}" && test -z "${USE_ATTR_SQL_FALSE}"; then
-  as_fn_error "conditional \"USE_ATTR_SQL\" was never defined.
+  as_fn_error $? "conditional \"USE_ATTR_SQL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_KERNEL_KLIPS_TRUE}" && test -z "${USE_KERNEL_KLIPS_FALSE}"; then
+  as_fn_error $? "conditional \"USE_KERNEL_KLIPS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_KERNEL_NETLINK_TRUE}" && test -z "${USE_KERNEL_NETLINK_FALSE}"; then
+  as_fn_error $? "conditional \"USE_KERNEL_NETLINK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_KERNEL_PFKEY_TRUE}" && test -z "${USE_KERNEL_PFKEY_FALSE}"; then
+  as_fn_error $? "conditional \"USE_KERNEL_PFKEY\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_KERNEL_PFROUTE_TRUE}" && test -z "${USE_KERNEL_PFROUTE_FALSE}"; then
+  as_fn_error $? "conditional \"USE_KERNEL_PFROUTE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_RESOLVE_TRUE}" && test -z "${USE_RESOLVE_FALSE}"; then
-  as_fn_error "conditional \"USE_RESOLVE\" was never defined.
+  as_fn_error $? "conditional \"USE_RESOLVE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_XAUTH_TRUE}" && test -z "${USE_XAUTH_FALSE}"; then
-  as_fn_error "conditional \"USE_XAUTH\" was never defined.
+  as_fn_error $? "conditional \"USE_XAUTH\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_SMARTCARD_TRUE}" && test -z "${USE_SMARTCARD_FALSE}"; then
-  as_fn_error "conditional \"USE_SMARTCARD\" was never defined.
+  as_fn_error $? "conditional \"USE_SMARTCARD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_CISCO_QUIRKS_TRUE}" && test -z "${USE_CISCO_QUIRKS_FALSE}"; then
-  as_fn_error "conditional \"USE_CISCO_QUIRKS\" was never defined.
+  as_fn_error $? "conditional \"USE_CISCO_QUIRKS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_LEAK_DETECTIVE_TRUE}" && test -z "${USE_LEAK_DETECTIVE_FALSE}"; then
-  as_fn_error "conditional \"USE_LEAK_DETECTIVE\" was never defined.
+  as_fn_error $? "conditional \"USE_LEAK_DETECTIVE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_LOCK_PROFILER_TRUE}" && test -z "${USE_LOCK_PROFILER_FALSE}"; then
-  as_fn_error "conditional \"USE_LOCK_PROFILER\" was never defined.
+  as_fn_error $? "conditional \"USE_LOCK_PROFILER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_NAT_TRANSPORT_TRUE}" && test -z "${USE_NAT_TRANSPORT_FALSE}"; then
-  as_fn_error "conditional \"USE_NAT_TRANSPORT\" was never defined.
+  as_fn_error $? "conditional \"USE_NAT_TRANSPORT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_VENDORID_TRUE}" && test -z "${USE_VENDORID_FALSE}"; then
-  as_fn_error "conditional \"USE_VENDORID\" was never defined.
+  as_fn_error $? "conditional \"USE_VENDORID\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_XAUTH_VID_TRUE}" && test -z "${USE_XAUTH_VID_FALSE}"; then
-  as_fn_error "conditional \"USE_XAUTH_VID\" was never defined.
+  as_fn_error $? "conditional \"USE_XAUTH_VID\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_DUMM_TRUE}" && test -z "${USE_DUMM_FALSE}"; then
-  as_fn_error "conditional \"USE_DUMM\" was never defined.
+  as_fn_error $? "conditional \"USE_DUMM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_FAST_TRUE}" && test -z "${USE_FAST_FALSE}"; then
-  as_fn_error "conditional \"USE_FAST\" was never defined.
+  as_fn_error $? "conditional \"USE_FAST\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_MANAGER_TRUE}" && test -z "${USE_MANAGER_FALSE}"; then
-  as_fn_error "conditional \"USE_MANAGER\" was never defined.
+  as_fn_error $? "conditional \"USE_MANAGER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_ME_TRUE}" && test -z "${USE_ME_FALSE}"; then
-  as_fn_error "conditional \"USE_ME\" was never defined.
+  as_fn_error $? "conditional \"USE_ME\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_INTEGRITY_TEST_TRUE}" && test -z "${USE_INTEGRITY_TEST_FALSE}"; then
-  as_fn_error "conditional \"USE_INTEGRITY_TEST\" was never defined.
+  as_fn_error $? "conditional \"USE_INTEGRITY_TEST\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_LOAD_WARNING_TRUE}" && test -z "${USE_LOAD_WARNING_FALSE}"; then
-  as_fn_error "conditional \"USE_LOAD_WARNING\" was never defined.
+  as_fn_error $? "conditional \"USE_LOAD_WARNING\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_PLUTO_TRUE}" && test -z "${USE_PLUTO_FALSE}"; then
-  as_fn_error "conditional \"USE_PLUTO\" was never defined.
+  as_fn_error $? "conditional \"USE_PLUTO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_THREADS_TRUE}" && test -z "${USE_THREADS_FALSE}"; then
-  as_fn_error "conditional \"USE_THREADS\" was never defined.
+  as_fn_error $? "conditional \"USE_THREADS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_CHARON_TRUE}" && test -z "${USE_CHARON_FALSE}"; then
-  as_fn_error "conditional \"USE_CHARON\" was never defined.
+  as_fn_error $? "conditional \"USE_CHARON\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_TOOLS_TRUE}" && test -z "${USE_TOOLS_FALSE}"; then
-  as_fn_error "conditional \"USE_TOOLS\" was never defined.
+  as_fn_error $? "conditional \"USE_TOOLS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_SCRIPTS_TRUE}" && test -z "${USE_SCRIPTS_FALSE}"; then
-  as_fn_error "conditional \"USE_SCRIPTS\" was never defined.
+  as_fn_error $? "conditional \"USE_SCRIPTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_LIBSTRONGSWAN_TRUE}" && test -z "${USE_LIBSTRONGSWAN_FALSE}"; then
-  as_fn_error "conditional \"USE_LIBSTRONGSWAN\" was never defined.
+  as_fn_error $? "conditional \"USE_LIBSTRONGSWAN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_LIBHYDRA_TRUE}" && test -z "${USE_LIBHYDRA_FALSE}"; then
-  as_fn_error "conditional \"USE_LIBHYDRA\" was never defined.
+  as_fn_error $? "conditional \"USE_LIBHYDRA\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_FILE_CONFIG_TRUE}" && test -z "${USE_FILE_CONFIG_FALSE}"; then
-  as_fn_error "conditional \"USE_FILE_CONFIG\" was never defined.
+  as_fn_error $? "conditional \"USE_FILE_CONFIG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_LIBCAP_TRUE}" && test -z "${USE_LIBCAP_FALSE}"; then
-  as_fn_error "conditional \"USE_LIBCAP\" was never defined.
+  as_fn_error $? "conditional \"USE_LIBCAP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_VSTR_TRUE}" && test -z "${USE_VSTR_FALSE}"; then
-  as_fn_error "conditional \"USE_VSTR\" was never defined.
+  as_fn_error $? "conditional \"USE_VSTR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_SIMAKA_TRUE}" && test -z "${USE_SIMAKA_FALSE}"; then
-  as_fn_error "conditional \"USE_SIMAKA\" was never defined.
+  as_fn_error $? "conditional \"USE_SIMAKA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_TLS_TRUE}" && test -z "${USE_TLS_FALSE}"; then
+  as_fn_error $? "conditional \"USE_TLS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${MONOLITHIC_TRUE}" && test -z "${MONOLITHIC_FALSE}"; then
-  as_fn_error "conditional \"MONOLITHIC\" was never defined.
+  as_fn_error $? "conditional \"MONOLITHIC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -17611,19 +18712,19 @@ export LANGUAGE
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -17819,7 +18920,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -17872,8 +18973,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.4.1, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+This file was extended by strongSwan $as_me 4.5.0, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -17929,11 +19030,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-strongSwan config.status 4.4.1
-configured by $0, generated by GNU Autoconf 2.65,
+strongSwan config.status 4.5.0
+configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -17951,11 +19052,16 @@ ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -17977,6 +19083,7 @@ do
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -17987,7 +19094,7 @@ do
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -18299,6 +19406,7 @@ do
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/include/Makefile") CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;;
     "src/libstrongswan/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/Makefile" ;;
@@ -18329,13 +19437,22 @@ do
     "src/libstrongswan/plugins/openssl/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/openssl/Makefile" ;;
     "src/libstrongswan/plugins/gcrypt/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/gcrypt/Makefile" ;;
     "src/libstrongswan/plugins/agent/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/agent/Makefile" ;;
+    "src/libstrongswan/plugins/pkcs11/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pkcs11/Makefile" ;;
+    "src/libstrongswan/plugins/ctr/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/ctr/Makefile" ;;
+    "src/libstrongswan/plugins/ccm/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/ccm/Makefile" ;;
+    "src/libstrongswan/plugins/gcm/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/gcm/Makefile" ;;
     "src/libstrongswan/plugins/test_vectors/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/test_vectors/Makefile" ;;
     "src/libhydra/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/Makefile" ;;
     "src/libhydra/plugins/attr/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/plugins/attr/Makefile" ;;
     "src/libhydra/plugins/attr_sql/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/plugins/attr_sql/Makefile" ;;
+    "src/libhydra/plugins/kernel_klips/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/plugins/kernel_klips/Makefile" ;;
+    "src/libhydra/plugins/kernel_netlink/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/plugins/kernel_netlink/Makefile" ;;
+    "src/libhydra/plugins/kernel_pfkey/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/plugins/kernel_pfkey/Makefile" ;;
+    "src/libhydra/plugins/kernel_pfroute/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/plugins/kernel_pfroute/Makefile" ;;
     "src/libhydra/plugins/resolve/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/plugins/resolve/Makefile" ;;
     "src/libfreeswan/Makefile") CONFIG_FILES="$CONFIG_FILES src/libfreeswan/Makefile" ;;
     "src/libsimaka/Makefile") CONFIG_FILES="$CONFIG_FILES src/libsimaka/Makefile" ;;
+    "src/libtls/Makefile") CONFIG_FILES="$CONFIG_FILES src/libtls/Makefile" ;;
     "src/pluto/Makefile") CONFIG_FILES="$CONFIG_FILES src/pluto/Makefile" ;;
     "src/pluto/plugins/xauth/Makefile") CONFIG_FILES="$CONFIG_FILES src/pluto/plugins/xauth/Makefile" ;;
     "src/whack/Makefile") CONFIG_FILES="$CONFIG_FILES src/whack/Makefile" ;;
@@ -18352,11 +19469,14 @@ do
     "src/libcharon/plugins/eap_simaka_pseudonym/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_simaka_pseudonym/Makefile" ;;
     "src/libcharon/plugins/eap_simaka_reauth/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_simaka_reauth/Makefile" ;;
     "src/libcharon/plugins/eap_mschapv2/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_mschapv2/Makefile" ;;
+    "src/libcharon/plugins/eap_tls/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_tls/Makefile" ;;
+    "src/libcharon/plugins/eap_ttls/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_ttls/Makefile" ;;
+    "src/libcharon/plugins/eap_tnc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_tnc/Makefile" ;;
     "src/libcharon/plugins/eap_radius/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_radius/Makefile" ;;
-    "src/libcharon/plugins/kernel_netlink/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/kernel_netlink/Makefile" ;;
-    "src/libcharon/plugins/kernel_pfkey/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/kernel_pfkey/Makefile" ;;
-    "src/libcharon/plugins/kernel_pfroute/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/kernel_pfroute/Makefile" ;;
-    "src/libcharon/plugins/kernel_klips/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/kernel_klips/Makefile" ;;
+    "src/libcharon/plugins/tnc_imc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnc_imc/Makefile" ;;
+    "src/libcharon/plugins/tnc_imv/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnc_imv/Makefile" ;;
+    "src/libcharon/plugins/tnccs_11/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnccs_11/Makefile" ;;
+    "src/libcharon/plugins/tnccs_20/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnccs_20/Makefile" ;;
     "src/libcharon/plugins/socket_default/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/socket_default/Makefile" ;;
     "src/libcharon/plugins/socket_raw/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/socket_raw/Makefile" ;;
     "src/libcharon/plugins/socket_dynamic/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/socket_dynamic/Makefile" ;;
@@ -18369,7 +19489,9 @@ do
     "src/libcharon/plugins/addrblock/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/addrblock/Makefile" ;;
     "src/libcharon/plugins/uci/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/uci/Makefile" ;;
     "src/libcharon/plugins/ha/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/ha/Makefile" ;;
+    "src/libcharon/plugins/led/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/led/Makefile" ;;
     "src/libcharon/plugins/android/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/android/Makefile" ;;
+    "src/libcharon/plugins/maemo/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/maemo/Makefile" ;;
     "src/libcharon/plugins/stroke/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/stroke/Makefile" ;;
     "src/libcharon/plugins/updown/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/updown/Makefile" ;;
     "src/libcharon/plugins/dhcp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/dhcp/Makefile" ;;
@@ -18393,7 +19515,7 @@ do
     "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
     "testing/Makefile") CONFIG_FILES="$CONFIG_FILES testing/Makefile" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac
 done
 
@@ -18430,7 +19552,7 @@ $debug ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -18447,7 +19569,7 @@ if test "x$ac_cr" = x; then
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -18461,18 +19583,18 @@ _ACEOF
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -18561,20 +19683,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -18592,7 +19722,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -18620,7 +19750,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -18647,7 +19777,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
     esac
     ;;
   esac
@@ -18784,22 +19914,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
 
 
@@ -19550,7 +20680,7 @@ _ACEOF
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -19571,7 +20701,7 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5