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

1 files changed, 682 insertions, 136 deletions

diff --git a/configure b/configure
index e36ba904c..952734d15 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for strongSwan 4.3.6.
+# Generated by GNU Autoconf 2.64 for strongSwan 4.4.0.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
@@ -695,8 +695,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='strongSwan'
 PACKAGE_TARNAME='strongswan'
-PACKAGE_VERSION='4.3.6'
-PACKAGE_STRING='strongSwan 4.3.6'
+PACKAGE_VERSION='4.4.0'
+PACKAGE_STRING='strongSwan 4.4.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -740,12 +740,16 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+MONOLITHIC_FALSE
+MONOLITHIC_TRUE
 USE_SIMAKA_FALSE
 USE_SIMAKA_TRUE
 USE_VSTR_FALSE
 USE_VSTR_TRUE
 USE_FILE_CONFIG_FALSE
 USE_FILE_CONFIG_TRUE
+USE_LIBHYDRA_FALSE
+USE_LIBHYDRA_TRUE
 USE_LIBSTRONGSWAN_FALSE
 USE_LIBSTRONGSWAN_TRUE
 USE_SCRIPTS_FALSE
@@ -784,6 +788,14 @@ USE_CISCO_QUIRKS_FALSE
 USE_CISCO_QUIRKS_TRUE
 USE_SMARTCARD_FALSE
 USE_SMARTCARD_TRUE
+USE_FARP_FALSE
+USE_FARP_TRUE
+USE_SOCKET_DYNAMIC_FALSE
+USE_SOCKET_DYNAMIC_TRUE
+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
@@ -814,12 +826,16 @@ USE_EAP_SIM_FILE_FALSE
 USE_EAP_SIM_FILE_TRUE
 USE_EAP_SIM_FALSE
 USE_EAP_SIM_TRUE
+USE_HA_FALSE
+USE_HA_TRUE
 USE_LOAD_TESTER_FALSE
 USE_LOAD_TESTER_TRUE
 USE_UNIT_TESTS_FALSE
 USE_UNIT_TESTS_TRUE
 USE_RESOLVE_FALSE
 USE_RESOLVE_TRUE
+USE_DHCP_FALSE
+USE_DHCP_TRUE
 USE_ATTR_FALSE
 USE_ATTR_TRUE
 USE_UPDOWN_FALSE
@@ -828,6 +844,8 @@ USE_SQL_FALSE
 USE_SQL_TRUE
 USE_SMP_FALSE
 USE_SMP_TRUE
+USE_ANDROID_FALSE
+USE_ANDROID_TRUE
 USE_UCI_FALSE
 USE_UCI_TRUE
 USE_NM_FALSE
@@ -895,6 +913,7 @@ USE_CURL_TRUE
 USE_TEST_VECTORS_FALSE
 USE_TEST_VECTORS_TRUE
 pluto_plugins
+libhydra_plugins
 libstrongswan_plugins
 nm_LIBS
 nm_CFLAGS
@@ -1058,6 +1077,7 @@ with_linux_headers
 with_routing_table
 with_routing_table_prio
 with_capabilities
+with_mpz_powm_sec
 with_xauth_module
 with_user
 with_group
@@ -1110,6 +1130,10 @@ enable_kernel_netlink
 enable_kernel_pfkey
 enable_kernel_pfroute
 enable_kernel_klips
+enable_socket_default
+enable_socket_raw
+enable_socket_dynamic
+enable_farp
 enable_nat_transport
 enable_vendor_id
 enable_xauth_vid
@@ -1126,14 +1150,18 @@ enable_scripts
 enable_updown
 enable_attr
 enable_attr_sql
+enable_dhcp
 enable_resolve
 enable_padlock
 enable_openssl
 enable_gcrypt
 enable_agent
 enable_uci
+enable_android
 enable_nm
+enable_ha
 enable_vstr
+enable_monolithic
 enable_dependency_tracking
 with_lib_prefix
 enable_shared
@@ -1702,7 +1730,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.3.6 to adapt to many kinds of systems.
+\`configure' configures strongSwan 4.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1772,7 +1800,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of strongSwan 4.3.6:";;
+     short | recursive ) echo "Configuration of strongSwan 4.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1843,6 +1871,13 @@ Optional Features:
   --enable-kernel-pfkey   enable the PF_KEY kernel interface.
   --enable-kernel-pfroute enable the PF_ROUTE kernel interface.
   --enable-kernel-klips   enable the KLIPS kernel interface.
+  --disable-socket-default
+                          disable default socket implementation for charon.
+  --enable-socket-raw     enable raw socket implementation of charon, enforced
+                          if pluto is enabled
+  --enable-socket-dynamic enable dynamic socket implementation for charon
+  --enable-farp           enable ARP faking plugin that responds to ARP
+                          requests to peers virtual IP
   --enable-nat-transport  enable NAT traversal with IPsec transport mode in
                           pluto.
   --disable-vendor-id     disable the sending of the strongSwan vendor ID in
@@ -1867,15 +1902,21 @@ Optional Features:
   --disable-attr          disable strongswan.conf based configuration
                           attribute plugin.
   --enable-attr-sql       enable SQL based configuration attribute plugin.
+  --enable-dhcp           enable DHCP based attribute provider plugin.
   --disable-resolve       disable resolve DNS handler plugin.
   --enable-padlock        enables VIA Padlock crypto plugin.
   --enable-openssl        enables the OpenSSL crypto plugin.
   --enable-gcrypt         enables the libgcrypt plugin.
   --enable-agent          enables the ssh-agent signing plugin.
   --enable-uci            enable OpenWRT UCI configuration plugin.
+  --enable-android        enable Android specific plugin.
   --enable-nm             enable NetworkManager plugin.
+  --enable-ha             enable high availability cluster plugin.
   --enable-vstr           enforce using the Vstr string library to replace
                           glibc-like printf hooks.
+  --enable-monolithic     build monolithic version of libstrongswan that
+                          includes all enabled plugins. Similarly, the plugins
+                          of charon are assembled in libcharon.
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -1919,6 +1960,8 @@ Optional Packages:
                           set priority for IPsec routing table (default: 220).
   --with-capabilities=arg set capability dropping library. Currently only the
                           value "libcap" is supported (default: no).
+  --with-mpz_powm_sec=arg use the more side-channel resistant mpz_powm_sec in
+                          libgmp, if available (default: yes).
   --with-xauth-module=lib set the path to the XAUTH module
   --with-user=user        change user of the daemons to "user" after startup
                           (default is "root").
@@ -2018,7 +2061,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-strongSwan configure 4.3.6
+strongSwan configure 4.4.0
 generated by GNU Autoconf 2.64
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2494,7 +2537,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by strongSwan $as_me 4.3.6, which was
+It was created by strongSwan $as_me 4.4.0, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
@@ -3302,7 +3345,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='strongswan'
- VERSION='4.3.6'
+ VERSION='4.4.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3710,6 +3753,16 @@ fi
 
 
 
+# Check whether --with-mpz_powm_sec was given.
+if test "${with_mpz_powm_sec+set}" = set; then :
+  withval=$with_mpz_powm_sec; mpz_powm_sec="$withval"
+else
+  mpz_powm_sec=yes
+
+fi
+
+
+
 
 # Check whether --with-xauth-module was given.
 if test "${with_xauth_module+set}" = set; then :
@@ -3764,949 +3817,1215 @@ fi
 
 # Check whether --enable-curl was given.
 if test "${enable_curl+set}" = set; then :
-  enableval=$enable_curl; if test x$enableval = xyes; then
+  enableval=$enable_curl; curl_given=true
+		if test x$enableval = xyes; then
 			curl=true
 		 else
 			curl=false
 		fi
 else
   curl=false
+		curl_given=false
 
 fi
 
 
 # Check whether --enable-ldap was given.
 if test "${enable_ldap+set}" = set; then :
-  enableval=$enable_ldap; if test x$enableval = xyes; then
+  enableval=$enable_ldap; ldap_given=true
+		if test x$enableval = xyes; then
 			ldap=true
 		 else
 			ldap=false
 		fi
 else
   ldap=false
+		ldap_given=false
 
 fi
 
 
 # Check whether --enable-aes was given.
 if test "${enable_aes+set}" = set; then :
-  enableval=$enable_aes; if test x$enableval = xyes; then
+  enableval=$enable_aes; aes_given=true
+		if test x$enableval = xyes; then
 			aes=true
 		 else
 			aes=false
 		fi
 else
   aes=true
+		aes_given=false
 
 fi
 
 
 # Check whether --enable-des was given.
 if test "${enable_des+set}" = set; then :
-  enableval=$enable_des; if test x$enableval = xyes; then
+  enableval=$enable_des; des_given=true
+		if test x$enableval = xyes; then
 			des=true
 		 else
 			des=false
 		fi
 else
   des=true
+		des_given=false
 
 fi
 
 
 # Check whether --enable-blowfish was given.
 if test "${enable_blowfish+set}" = set; then :
-  enableval=$enable_blowfish; if test x$enableval = xyes; then
+  enableval=$enable_blowfish; blowfish_given=true
+		if test x$enableval = xyes; then
 			blowfish=true
 		 else
 			blowfish=false
 		fi
 else
   blowfish=false
+		blowfish_given=false
 
 fi
 
 
 # Check whether --enable-md4 was given.
 if test "${enable_md4+set}" = set; then :
-  enableval=$enable_md4; if test x$enableval = xyes; then
+  enableval=$enable_md4; md4_given=true
+		if test x$enableval = xyes; then
 			md4=true
 		 else
 			md4=false
 		fi
 else
   md4=false
+		md4_given=false
 
 fi
 
 
 # Check whether --enable-md5 was given.
 if test "${enable_md5+set}" = set; then :
-  enableval=$enable_md5; if test x$enableval = xyes; then
+  enableval=$enable_md5; md5_given=true
+		if test x$enableval = xyes; then
 			md5=true
 		 else
 			md5=false
 		fi
 else
   md5=true
+		md5_given=false
 
 fi
 
 
 # Check whether --enable-sha1 was given.
 if test "${enable_sha1+set}" = set; then :
-  enableval=$enable_sha1; if test x$enableval = xyes; then
+  enableval=$enable_sha1; sha1_given=true
+		if test x$enableval = xyes; then
 			sha1=true
 		 else
 			sha1=false
 		fi
 else
   sha1=true
+		sha1_given=false
 
 fi
 
 
 # Check whether --enable-sha2 was given.
 if test "${enable_sha2+set}" = set; then :
-  enableval=$enable_sha2; if test x$enableval = xyes; then
+  enableval=$enable_sha2; sha2_given=true
+		if test x$enableval = xyes; then
 			sha2=true
 		 else
 			sha2=false
 		fi
 else
   sha2=true
+		sha2_given=false
 
 fi
 
 
 # Check whether --enable-fips-prf was given.
 if test "${enable_fips_prf+set}" = set; then :
-  enableval=$enable_fips_prf; if test x$enableval = xyes; then
+  enableval=$enable_fips_prf; fips_prf_given=true
+		if test x$enableval = xyes; then
 			fips_prf=true
 		 else
 			fips_prf=false
 		fi
 else
   fips_prf=true
+		fips_prf_given=false
 
 fi
 
 
 # Check whether --enable-gmp was given.
 if test "${enable_gmp+set}" = set; then :
-  enableval=$enable_gmp; if test x$enableval = xyes; then
+  enableval=$enable_gmp; gmp_given=true
+		if test x$enableval = xyes; then
 			gmp=true
 		 else
 			gmp=false
 		fi
 else
   gmp=true
+		gmp_given=false
 
 fi
 
 
 # Check whether --enable-random was given.
 if test "${enable_random+set}" = set; then :
-  enableval=$enable_random; if test x$enableval = xyes; then
+  enableval=$enable_random; random_given=true
+		if test x$enableval = xyes; then
 			random=true
 		 else
 			random=false
 		fi
 else
   random=true
+		random_given=false
 
 fi
 
 
 # Check whether --enable-x509 was given.
 if test "${enable_x509+set}" = set; then :
-  enableval=$enable_x509; if test x$enableval = xyes; then
+  enableval=$enable_x509; x509_given=true
+		if test x$enableval = xyes; then
 			x509=true
 		 else
 			x509=false
 		fi
 else
   x509=true
+		x509_given=false
 
 fi
 
 
 # Check whether --enable-pubkey was given.
 if test "${enable_pubkey+set}" = set; then :
-  enableval=$enable_pubkey; if test x$enableval = xyes; then
+  enableval=$enable_pubkey; pubkey_given=true
+		if test x$enableval = xyes; then
 			pubkey=true
 		 else
 			pubkey=false
 		fi
 else
   pubkey=true
+		pubkey_given=false
 
 fi
 
 
 # Check whether --enable-pkcs1 was given.
 if test "${enable_pkcs1+set}" = set; then :
-  enableval=$enable_pkcs1; if test x$enableval = xyes; then
+  enableval=$enable_pkcs1; pkcs1_given=true
+		if test x$enableval = xyes; then
 			pkcs1=true
 		 else
 			pkcs1=false
 		fi
 else
   pkcs1=true
+		pkcs1_given=false
 
 fi
 
 
 # Check whether --enable-pgp was given.
 if test "${enable_pgp+set}" = set; then :
-  enableval=$enable_pgp; if test x$enableval = xyes; then
+  enableval=$enable_pgp; pgp_given=true
+		if test x$enableval = xyes; then
 			pgp=true
 		 else
 			pgp=false
 		fi
 else
   pgp=true
+		pgp_given=false
 
 fi
 
 
 # Check whether --enable-dnskey was given.
 if test "${enable_dnskey+set}" = set; then :
-  enableval=$enable_dnskey; if test x$enableval = xyes; then
+  enableval=$enable_dnskey; dnskey_given=true
+		if test x$enableval = xyes; then
 			dnskey=true
 		 else
 			dnskey=false
 		fi
 else
   dnskey=true
+		dnskey_given=false
 
 fi
 
 
 # Check whether --enable-pem was given.
 if test "${enable_pem+set}" = set; then :
-  enableval=$enable_pem; if test x$enableval = xyes; then
+  enableval=$enable_pem; pem_given=true
+		if test x$enableval = xyes; then
 			pem=true
 		 else
 			pem=false
 		fi
 else
   pem=true
+		pem_given=false
 
 fi
 
 
 # Check whether --enable-hmac was given.
 if test "${enable_hmac+set}" = set; then :
-  enableval=$enable_hmac; if test x$enableval = xyes; then
+  enableval=$enable_hmac; hmac_given=true
+		if test x$enableval = xyes; then
 			hmac=true
 		 else
 			hmac=false
 		fi
 else
   hmac=true
+		hmac_given=false
 
 fi
 
 
 # Check whether --enable-xcbc was given.
 if test "${enable_xcbc+set}" = set; then :
-  enableval=$enable_xcbc; if test x$enableval = xyes; then
+  enableval=$enable_xcbc; xcbc_given=true
+		if test x$enableval = xyes; then
 			xcbc=true
 		 else
 			xcbc=false
 		fi
 else
   xcbc=true
+		xcbc_given=false
 
 fi
 
 
 # Check whether --enable-test-vectors was given.
 if test "${enable_test_vectors+set}" = set; then :
-  enableval=$enable_test_vectors; if test x$enableval = xyes; then
+  enableval=$enable_test_vectors; test_vectors_given=true
+		if test x$enableval = xyes; then
 			test_vectors=true
 		 else
 			test_vectors=false
 		fi
 else
   test_vectors=false
+		test_vectors_given=false
 
 fi
 
 
 # Check whether --enable-mysql was given.
 if test "${enable_mysql+set}" = set; then :
-  enableval=$enable_mysql; if test x$enableval = xyes; then
+  enableval=$enable_mysql; mysql_given=true
+		if test x$enableval = xyes; then
 			mysql=true
 		 else
 			mysql=false
 		fi
 else
   mysql=false
+		mysql_given=false
 
 fi
 
 
 # Check whether --enable-sqlite was given.
 if test "${enable_sqlite+set}" = set; then :
-  enableval=$enable_sqlite; if test x$enableval = xyes; then
+  enableval=$enable_sqlite; sqlite_given=true
+		if test x$enableval = xyes; then
 			sqlite=true
 		 else
 			sqlite=false
 		fi
 else
   sqlite=false
+		sqlite_given=false
 
 fi
 
 
 # Check whether --enable-stroke was given.
 if test "${enable_stroke+set}" = set; then :
-  enableval=$enable_stroke; if test x$enableval = xyes; then
+  enableval=$enable_stroke; stroke_given=true
+		if test x$enableval = xyes; then
 			stroke=true
 		 else
 			stroke=false
 		fi
 else
   stroke=true
+		stroke_given=false
 
 fi
 
 
 # Check whether --enable-medsrv was given.
 if test "${enable_medsrv+set}" = set; then :
-  enableval=$enable_medsrv; if test x$enableval = xyes; then
+  enableval=$enable_medsrv; medsrv_given=true
+		if test x$enableval = xyes; then
 			medsrv=true
 		 else
 			medsrv=false
 		fi
 else
   medsrv=false
+		medsrv_given=false
 
 fi
 
 
 # Check whether --enable-medcli was given.
 if test "${enable_medcli+set}" = set; then :
-  enableval=$enable_medcli; if test x$enableval = xyes; then
+  enableval=$enable_medcli; medcli_given=true
+		if test x$enableval = xyes; then
 			medcli=true
 		 else
 			medcli=false
 		fi
 else
   medcli=false
+		medcli_given=false
 
 fi
 
 
 # Check whether --enable-smp was given.
 if test "${enable_smp+set}" = set; then :
-  enableval=$enable_smp; if test x$enableval = xyes; then
+  enableval=$enable_smp; smp_given=true
+		if test x$enableval = xyes; then
 			smp=true
 		 else
 			smp=false
 		fi
 else
   smp=false
+		smp_given=false
 
 fi
 
 
 # Check whether --enable-sql was given.
 if test "${enable_sql+set}" = set; then :
-  enableval=$enable_sql; if test x$enableval = xyes; then
+  enableval=$enable_sql; sql_given=true
+		if test x$enableval = xyes; then
 			sql=true
 		 else
 			sql=false
 		fi
 else
   sql=false
+		sql_given=false
 
 fi
 
 
 # Check whether --enable-smartcard was given.
 if test "${enable_smartcard+set}" = set; then :
-  enableval=$enable_smartcard; if test x$enableval = xyes; then
+  enableval=$enable_smartcard; smartcard_given=true
+		if test x$enableval = xyes; then
 			smartcard=true
 		 else
 			smartcard=false
 		fi
 else
   smartcard=false
+		smartcard_given=false
 
 fi
 
 
 # Check whether --enable-cisco-quirks was given.
 if test "${enable_cisco_quirks+set}" = set; then :
-  enableval=$enable_cisco_quirks; if test x$enableval = xyes; then
+  enableval=$enable_cisco_quirks; cisco_quirks_given=true
+		if test x$enableval = xyes; then
 			cisco_quirks=true
 		 else
 			cisco_quirks=false
 		fi
 else
   cisco_quirks=false
+		cisco_quirks_given=false
 
 fi
 
 
 # Check whether --enable-leak-detective was given.
 if test "${enable_leak_detective+set}" = set; then :
-  enableval=$enable_leak_detective; if test x$enableval = xyes; then
+  enableval=$enable_leak_detective; leak_detective_given=true
+		if test x$enableval = xyes; then
 			leak_detective=true
 		 else
 			leak_detective=false
 		fi
 else
   leak_detective=false
+		leak_detective_given=false
 
 fi
 
 
 # Check whether --enable-lock-profiler was given.
 if test "${enable_lock_profiler+set}" = set; then :
-  enableval=$enable_lock_profiler; if test x$enableval = xyes; then
+  enableval=$enable_lock_profiler; lock_profiler_given=true
+		if test x$enableval = xyes; then
 			lock_profiler=true
 		 else
 			lock_profiler=false
 		fi
 else
   lock_profiler=false
+		lock_profiler_given=false
 
 fi
 
 
 # Check whether --enable-unit-tests was given.
 if test "${enable_unit_tests+set}" = set; then :
-  enableval=$enable_unit_tests; if test x$enableval = xyes; then
+  enableval=$enable_unit_tests; unit_tests_given=true
+		if test x$enableval = xyes; then
 			unit_tests=true
 		 else
 			unit_tests=false
 		fi
 else
   unit_tests=false
+		unit_tests_given=false
 
 fi
 
 
 # Check whether --enable-load-tester was given.
 if test "${enable_load_tester+set}" = set; then :
-  enableval=$enable_load_tester; if test x$enableval = xyes; then
+  enableval=$enable_load_tester; load_tester_given=true
+		if test x$enableval = xyes; then
 			load_tester=true
 		 else
 			load_tester=false
 		fi
 else
   load_tester=false
+		load_tester_given=false
 
 fi
 
 
 # Check whether --enable-eap-sim was given.
 if test "${enable_eap_sim+set}" = set; then :
-  enableval=$enable_eap_sim; if test x$enableval = xyes; then
+  enableval=$enable_eap_sim; eap_sim_given=true
+		if test x$enableval = xyes; then
 			eap_sim=true
 		 else
 			eap_sim=false
 		fi
 else
   eap_sim=false
+		eap_sim_given=false
 
 fi
 
 
 # Check whether --enable-eap-sim-file was given.
 if test "${enable_eap_sim_file+set}" = set; then :
-  enableval=$enable_eap_sim_file; if test x$enableval = xyes; then
+  enableval=$enable_eap_sim_file; eap_sim_file_given=true
+		if test x$enableval = xyes; then
 			eap_sim_file=true
 		 else
 			eap_sim_file=false
 		fi
 else
   eap_sim_file=false
+		eap_sim_file_given=false
 
 fi
 
 
 # Check whether --enable-eap-simaka-pseudonym was given.
 if test "${enable_eap_simaka_pseudonym+set}" = set; then :
-  enableval=$enable_eap_simaka_pseudonym; if test x$enableval = xyes; then
+  enableval=$enable_eap_simaka_pseudonym; eap_simaka_pseudonym_given=true
+		if test x$enableval = xyes; then
 			eap_simaka_pseudonym=true
 		 else
 			eap_simaka_pseudonym=false
 		fi
 else
   eap_simaka_pseudonym=false
+		eap_simaka_pseudonym_given=false
 
 fi
 
 
 # Check whether --enable-eap-simaka-reauth was given.
 if test "${enable_eap_simaka_reauth+set}" = set; then :
-  enableval=$enable_eap_simaka_reauth; if test x$enableval = xyes; then
+  enableval=$enable_eap_simaka_reauth; eap_simaka_reauth_given=true
+		if test x$enableval = xyes; then
 			eap_simaka_reauth=true
 		 else
 			eap_simaka_reauth=false
 		fi
 else
   eap_simaka_reauth=false
+		eap_simaka_reauth_given=false
 
 fi
 
 
 # Check whether --enable-eap-identity was given.
 if test "${enable_eap_identity+set}" = set; then :
-  enableval=$enable_eap_identity; if test x$enableval = xyes; then
+  enableval=$enable_eap_identity; eap_identity_given=true
+		if test x$enableval = xyes; then
 			eap_identity=true
 		 else
 			eap_identity=false
 		fi
 else
   eap_identity=false
+		eap_identity_given=false
 
 fi
 
 
 # Check whether --enable-eap-md5 was given.
 if test "${enable_eap_md5+set}" = set; then :
-  enableval=$enable_eap_md5; if test x$enableval = xyes; then
+  enableval=$enable_eap_md5; eap_md5_given=true
+		if test x$enableval = xyes; then
 			eap_md5=true
 		 else
 			eap_md5=false
 		fi
 else
   eap_md5=false
+		eap_md5_given=false
 
 fi
 
 
 # Check whether --enable-eap-gtc was given.
 if test "${enable_eap_gtc+set}" = set; then :
-  enableval=$enable_eap_gtc; if test x$enableval = xyes; then
+  enableval=$enable_eap_gtc; eap_gtc_given=true
+		if test x$enableval = xyes; then
 			eap_gtc=true
 		 else
 			eap_gtc=false
 		fi
 else
   eap_gtc=false
+		eap_gtc_given=false
 
 fi
 
 
 # Check whether --enable-eap-aka was given.
 if test "${enable_eap_aka+set}" = set; then :
-  enableval=$enable_eap_aka; if test x$enableval = xyes; then
+  enableval=$enable_eap_aka; eap_aka_given=true
+		if test x$enableval = xyes; then
 			eap_aka=true
 		 else
 			eap_aka=false
 		fi
 else
   eap_aka=false
+		eap_aka_given=false
 
 fi
 
 
 # Check whether --enable-eap-aka-3gpp2 was given.
 if test "${enable_eap_aka_3gpp2+set}" = set; then :
-  enableval=$enable_eap_aka_3gpp2; if test x$enableval = xyes; then
+  enableval=$enable_eap_aka_3gpp2; eap_aka_3gpp2_given=true
+		if test x$enableval = xyes; then
 			eap_aka_3gpp2=true
 		 else
 			eap_aka_3gpp2=false
 		fi
 else
   eap_aka_3gpp2=false
+		eap_aka_3gpp2_given=false
 
 fi
 
 
 # Check whether --enable-eap-mschapv2 was given.
 if test "${enable_eap_mschapv2+set}" = set; then :
-  enableval=$enable_eap_mschapv2; if test x$enableval = xyes; then
+  enableval=$enable_eap_mschapv2; eap_mschapv2_given=true
+		if test x$enableval = xyes; then
 			eap_mschapv2=true
 		 else
 			eap_mschapv2=false
 		fi
 else
   eap_mschapv2=false
+		eap_mschapv2_given=false
 
 fi
 
 
 # Check whether --enable-eap-radius was given.
 if test "${enable_eap_radius+set}" = set; then :
-  enableval=$enable_eap_radius; if test x$enableval = xyes; then
+  enableval=$enable_eap_radius; eap_radius_given=true
+		if test x$enableval = xyes; then
 			eap_radius=true
 		 else
 			eap_radius=false
 		fi
 else
   eap_radius=false
+		eap_radius_given=false
 
 fi
 
 
 # Check whether --enable-kernel-netlink was given.
 if test "${enable_kernel_netlink+set}" = set; then :
-  enableval=$enable_kernel_netlink; if test x$enableval = xyes; then
+  enableval=$enable_kernel_netlink; kernel_netlink_given=true
+		if test x$enableval = xyes; then
 			kernel_netlink=true
 		 else
 			kernel_netlink=false
 		fi
 else
   kernel_netlink=true
+		kernel_netlink_given=false
 
 fi
 
 
 # Check whether --enable-kernel-pfkey was given.
 if test "${enable_kernel_pfkey+set}" = set; then :
-  enableval=$enable_kernel_pfkey; if test x$enableval = xyes; then
+  enableval=$enable_kernel_pfkey; kernel_pfkey_given=true
+		if test x$enableval = xyes; then
 			kernel_pfkey=true
 		 else
 			kernel_pfkey=false
 		fi
 else
   kernel_pfkey=false
+		kernel_pfkey_given=false
 
 fi
 
 
 # Check whether --enable-kernel-pfroute was given.
 if test "${enable_kernel_pfroute+set}" = set; then :
-  enableval=$enable_kernel_pfroute; if test x$enableval = xyes; then
+  enableval=$enable_kernel_pfroute; kernel_pfroute_given=true
+		if test x$enableval = xyes; then
 			kernel_pfroute=true
 		 else
 			kernel_pfroute=false
 		fi
 else
   kernel_pfroute=false
+		kernel_pfroute_given=false
 
 fi
 
 
 # Check whether --enable-kernel-klips was given.
 if test "${enable_kernel_klips+set}" = set; then :
-  enableval=$enable_kernel_klips; if test x$enableval = xyes; then
+  enableval=$enable_kernel_klips; kernel_klips_given=true
+		if test x$enableval = xyes; then
 			kernel_klips=true
 		 else
 			kernel_klips=false
 		fi
 else
   kernel_klips=false
+		kernel_klips_given=false
+
+fi
+
+
+# Check whether --enable-socket-default was given.
+if test "${enable_socket_default+set}" = set; then :
+  enableval=$enable_socket_default; socket_default_given=true
+		if test x$enableval = xyes; then
+			socket_default=true
+		 else
+			socket_default=false
+		fi
+else
+  socket_default=true
+		socket_default_given=false
+
+fi
+
+
+# Check whether --enable-socket-raw was given.
+if test "${enable_socket_raw+set}" = set; then :
+  enableval=$enable_socket_raw; socket_raw_given=true
+		if test x$enableval = xyes; then
+			socket_raw=true
+		 else
+			socket_raw=false
+		fi
+else
+  socket_raw=false
+		socket_raw_given=false
+
+fi
+
+
+# Check whether --enable-socket-dynamic was given.
+if test "${enable_socket_dynamic+set}" = set; then :
+  enableval=$enable_socket_dynamic; socket_dynamic_given=true
+		if test x$enableval = xyes; then
+			socket_dynamic=true
+		 else
+			socket_dynamic=false
+		fi
+else
+  socket_dynamic=false
+		socket_dynamic_given=false
+
+fi
+
+
+# Check whether --enable-farp was given.
+if test "${enable_farp+set}" = set; then :
+  enableval=$enable_farp; farp_given=true
+		if test x$enableval = xyes; then
+			farp=true
+		 else
+			farp=false
+		fi
+else
+  farp=false
+		farp_given=false
 
 fi
 
 
 # Check whether --enable-nat-transport was given.
 if test "${enable_nat_transport+set}" = set; then :
-  enableval=$enable_nat_transport; if test x$enableval = xyes; then
+  enableval=$enable_nat_transport; nat_transport_given=true
+		if test x$enableval = xyes; then
 			nat_transport=true
 		 else
 			nat_transport=false
 		fi
 else
   nat_transport=false
+		nat_transport_given=false
 
 fi
 
 
 # Check whether --enable-vendor-id was given.
 if test "${enable_vendor_id+set}" = set; then :
-  enableval=$enable_vendor_id; if test x$enableval = xyes; then
+  enableval=$enable_vendor_id; vendor_id_given=true
+		if test x$enableval = xyes; then
 			vendor_id=true
 		 else
 			vendor_id=false
 		fi
 else
   vendor_id=true
+		vendor_id_given=false
 
 fi
 
 
 # Check whether --enable-xauth-vid was given.
 if test "${enable_xauth_vid+set}" = set; then :
-  enableval=$enable_xauth_vid; if test x$enableval = xyes; then
+  enableval=$enable_xauth_vid; xauth_vid_given=true
+		if test x$enableval = xyes; then
 			xauth_vid=true
 		 else
 			xauth_vid=false
 		fi
 else
   xauth_vid=true
+		xauth_vid_given=false
 
 fi
 
 
 # Check whether --enable-dumm was given.
 if test "${enable_dumm+set}" = set; then :
-  enableval=$enable_dumm; if test x$enableval = xyes; then
+  enableval=$enable_dumm; dumm_given=true
+		if test x$enableval = xyes; then
 			dumm=true
 		 else
 			dumm=false
 		fi
 else
   dumm=false
+		dumm_given=false
 
 fi
 
 
 # Check whether --enable-fast was given.
 if test "${enable_fast+set}" = set; then :
-  enableval=$enable_fast; if test x$enableval = xyes; then
+  enableval=$enable_fast; fast_given=true
+		if test x$enableval = xyes; then
 			fast=true
 		 else
 			fast=false
 		fi
 else
   fast=false
+		fast_given=false
 
 fi
 
 
 # Check whether --enable-manager was given.
 if test "${enable_manager+set}" = set; then :
-  enableval=$enable_manager; if test x$enableval = xyes; then
+  enableval=$enable_manager; manager_given=true
+		if test x$enableval = xyes; then
 			manager=true
 		 else
 			manager=false
 		fi
 else
   manager=false
+		manager_given=false
 
 fi
 
 
 # Check whether --enable-mediation was given.
 if test "${enable_mediation+set}" = set; then :
-  enableval=$enable_mediation; if test x$enableval = xyes; then
+  enableval=$enable_mediation; mediation_given=true
+		if test x$enableval = xyes; then
 			mediation=true
 		 else
 			mediation=false
 		fi
 else
   mediation=false
+		mediation_given=false
 
 fi
 
 
 # Check whether --enable-integrity-test was given.
 if test "${enable_integrity_test+set}" = set; then :
-  enableval=$enable_integrity_test; if test x$enableval = xyes; then
+  enableval=$enable_integrity_test; integrity_test_given=true
+		if test x$enableval = xyes; then
 			integrity_test=true
 		 else
 			integrity_test=false
 		fi
 else
   integrity_test=false
+		integrity_test_given=false
 
 fi
 
 
 # Check whether --enable-pluto was given.
 if test "${enable_pluto+set}" = set; then :
-  enableval=$enable_pluto; if test x$enableval = xyes; then
+  enableval=$enable_pluto; pluto_given=true
+		if test x$enableval = xyes; then
 			pluto=true
 		 else
 			pluto=false
 		fi
 else
   pluto=true
+		pluto_given=false
 
 fi
 
 
 # Check whether --enable-threads was given.
 if test "${enable_threads+set}" = set; then :
-  enableval=$enable_threads; if test x$enableval = xyes; then
+  enableval=$enable_threads; threads_given=true
+		if test x$enableval = xyes; then
 			threads=true
 		 else
 			threads=false
 		fi
 else
   threads=true
+		threads_given=false
 
 fi
 
 
 # Check whether --enable-charon was given.
 if test "${enable_charon+set}" = set; then :
-  enableval=$enable_charon; if test x$enableval = xyes; then
+  enableval=$enable_charon; charon_given=true
+		if test x$enableval = xyes; then
 			charon=true
 		 else
 			charon=false
 		fi
 else
   charon=true
+		charon_given=false
 
 fi
 
 
 # Check whether --enable-tools was given.
 if test "${enable_tools+set}" = set; then :
-  enableval=$enable_tools; if test x$enableval = xyes; then
+  enableval=$enable_tools; tools_given=true
+		if test x$enableval = xyes; then
 			tools=true
 		 else
 			tools=false
 		fi
 else
   tools=true
+		tools_given=false
 
 fi
 
 
 # Check whether --enable-scripts was given.
 if test "${enable_scripts+set}" = set; then :
-  enableval=$enable_scripts; if test x$enableval = xyes; then
+  enableval=$enable_scripts; scripts_given=true
+		if test x$enableval = xyes; then
 			scripts=true
 		 else
 			scripts=false
 		fi
 else
   scripts=true
+		scripts_given=false
 
 fi
 
 
 # Check whether --enable-updown was given.
 if test "${enable_updown+set}" = set; then :
-  enableval=$enable_updown; if test x$enableval = xyes; then
+  enableval=$enable_updown; updown_given=true
+		if test x$enableval = xyes; then
 			updown=true
 		 else
 			updown=false
 		fi
 else
   updown=true
+		updown_given=false
 
 fi
 
 
 # Check whether --enable-attr was given.
 if test "${enable_attr+set}" = set; then :
-  enableval=$enable_attr; if test x$enableval = xyes; then
+  enableval=$enable_attr; attr_given=true
+		if test x$enableval = xyes; then
 			attr=true
 		 else
 			attr=false
 		fi
 else
   attr=true
+		attr_given=false
 
 fi
 
 
 # Check whether --enable-attr-sql was given.
 if test "${enable_attr_sql+set}" = set; then :
-  enableval=$enable_attr_sql; if test x$enableval = xyes; then
+  enableval=$enable_attr_sql; attr_sql_given=true
+		if test x$enableval = xyes; then
 			attr_sql=true
 		 else
 			attr_sql=false
 		fi
 else
   attr_sql=false
+		attr_sql_given=false
+
+fi
+
+
+# Check whether --enable-dhcp was given.
+if test "${enable_dhcp+set}" = set; then :
+  enableval=$enable_dhcp; dhcp_given=true
+		if test x$enableval = xyes; then
+			dhcp=true
+		 else
+			dhcp=false
+		fi
+else
+  dhcp=false
+		dhcp_given=false
 
 fi
 
 
 # Check whether --enable-resolve was given.
 if test "${enable_resolve+set}" = set; then :
-  enableval=$enable_resolve; if test x$enableval = xyes; then
+  enableval=$enable_resolve; resolve_given=true
+		if test x$enableval = xyes; then
 			resolve=true
 		 else
 			resolve=false
 		fi
 else
   resolve=true
+		resolve_given=false
 
 fi
 
 
 # Check whether --enable-padlock was given.
 if test "${enable_padlock+set}" = set; then :
-  enableval=$enable_padlock; if test x$enableval = xyes; then
+  enableval=$enable_padlock; padlock_given=true
+		if test x$enableval = xyes; then
 			padlock=true
 		 else
 			padlock=false
 		fi
 else
   padlock=false
+		padlock_given=false
 
 fi
 
 
 # Check whether --enable-openssl was given.
 if test "${enable_openssl+set}" = set; then :
-  enableval=$enable_openssl; if test x$enableval = xyes; then
+  enableval=$enable_openssl; openssl_given=true
+		if test x$enableval = xyes; then
 			openssl=true
 		 else
 			openssl=false
 		fi
 else
   openssl=false
+		openssl_given=false
 
 fi
 
 
 # Check whether --enable-gcrypt was given.
 if test "${enable_gcrypt+set}" = set; then :
-  enableval=$enable_gcrypt; if test x$enableval = xyes; then
+  enableval=$enable_gcrypt; gcrypt_given=true
+		if test x$enableval = xyes; then
 			gcrypt=true
 		 else
 			gcrypt=false
 		fi
 else
   gcrypt=false
+		gcrypt_given=false
 
 fi
 
 
 # Check whether --enable-agent was given.
 if test "${enable_agent+set}" = set; then :
-  enableval=$enable_agent; if test x$enableval = xyes; then
+  enableval=$enable_agent; agent_given=true
+		if test x$enableval = xyes; then
 			agent=true
 		 else
 			agent=false
 		fi
 else
   agent=false
+		agent_given=false
 
 fi
 
 
 # Check whether --enable-uci was given.
 if test "${enable_uci+set}" = set; then :
-  enableval=$enable_uci; if test x$enableval = xyes; then
+  enableval=$enable_uci; uci_given=true
+		if test x$enableval = xyes; then
 			uci=true
 		 else
 			uci=false
 		fi
 else
   uci=false
+		uci_given=false
+
+fi
+
+
+# Check whether --enable-android was given.
+if test "${enable_android+set}" = set; then :
+  enableval=$enable_android; android_given=true
+		if test x$enableval = xyes; then
+			android=true
+		 else
+			android=false
+		fi
+else
+  android=false
+		android_given=false
 
 fi
 
 
 # Check whether --enable-nm was given.
 if test "${enable_nm+set}" = set; then :
-  enableval=$enable_nm; if test x$enableval = xyes; then
+  enableval=$enable_nm; nm_given=true
+		if test x$enableval = xyes; then
 			nm=true
 		 else
 			nm=false
 		fi
 else
   nm=false
+		nm_given=false
+
+fi
+
+
+# Check whether --enable-ha was given.
+if test "${enable_ha+set}" = set; then :
+  enableval=$enable_ha; ha_given=true
+		if test x$enableval = xyes; then
+			ha=true
+		 else
+			ha=false
+		fi
+else
+  ha=false
+		ha_given=false
 
 fi
 
 
 # Check whether --enable-vstr was given.
 if test "${enable_vstr+set}" = set; then :
-  enableval=$enable_vstr; if test x$enableval = xyes; then
+  enableval=$enable_vstr; vstr_given=true
+		if test x$enableval = xyes; then
 			vstr=true
 		 else
 			vstr=false
 		fi
 else
   vstr=false
+		vstr_given=false
+
+fi
+
+
+# Check whether --enable-monolithic was given.
+if test "${enable_monolithic+set}" = set; then :
+  enableval=$enable_monolithic; monolithic_given=true
+		if test x$enableval = xyes; then
+			monolithic=true
+		 else
+			monolithic=false
+		fi
+else
+  monolithic=false
+		monolithic_given=false
 
 fi
 
@@ -6997,13 +7316,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:7000: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:7319: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7003: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:7322: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7006: output\"" >&5)
+  (eval echo "\"\$as_me:7325: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -8208,7 +8527,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8211 "configure"' > conftest.$ac_ext
+  echo '#line 8530 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9470,11 +9789,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:9473: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9792: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9477: \$? = $ac_status" >&5
+   echo "$as_me:9796: \$? = $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.
@@ -9809,11 +10128,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:9812: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10131: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9816: \$? = $ac_status" >&5
+   echo "$as_me:10135: \$? = $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.
@@ -9914,11 +10233,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:9917: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10236: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9921: \$? = $ac_status" >&5
+   echo "$as_me:10240: \$? = $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
@@ -9969,11 +10288,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:9972: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10291: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9976: \$? = $ac_status" >&5
+   echo "$as_me:10295: \$? = $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
@@ -12352,7 +12671,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12355 "configure"
+#line 12674 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12448,7 +12767,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12451 "configure"
+#line 12770 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13110,7 +13429,6 @@ fi
 
 if test x$eap_aka = xtrue; then
 	fips_prf=true;
-	sha1=true;
 	simaka=true;
 fi
 
@@ -13120,7 +13438,9 @@ if test x$eap_sim = xtrue; then
 fi
 
 if test x$fips_prf = xtrue; then
-	sha1=true;
+	if test x$openssl = xfalse; then
+		sha1=true;
+	fi
 fi
 
 if test x$smp = xtrue; then
@@ -13140,6 +13460,17 @@ if test x$medcli = xtrue; then
 	mediation=true
 fi
 
+if test x$pluto = xtrue; then
+	if test x$socket_raw = xfalse; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: Enforcing --enable-socket-raw, as pluto is enabled" >&5
+$as_echo "$as_me: Enforcing --enable-socket-raw, as pluto is enabled" >&6;}
+		socket_raw=true
+		if test x$socket_default_given = xfalse; then
+			socket_default=false
+		fi
+	fi
+fi
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
@@ -14213,6 +14544,7 @@ ac_cv_lib_vstr=ac_cv_lib_vstr_main
 fi
 
 if test x$gmp = xtrue; then
+	saved_LIBS=$LIBS
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgmp" >&5
 $as_echo_n "checking for main in -lgmp... " >&6; }
 if test "${ac_cv_lib_gmp_main+set}" = set; then :
@@ -14244,12 +14576,48 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp_main" >&5
 $as_echo "$ac_cv_lib_gmp_main" >&6; }
 if test "x$ac_cv_lib_gmp_main" = x""yes; then :
-  LIBS="$LIBS"
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBGMP 1
+_ACEOF
+
+  LIBS="-lgmp $LIBS"
+
 else
   as_fn_error "GNU Multi Precision library gmp not found" "$LINENO" 5
 fi
 ac_cv_lib_gmp=ac_cv_lib_gmp_main
 
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking mpz_powm_sec" >&5
+$as_echo_n "checking mpz_powm_sec... " >&6; }
+	if test x$mpz_powm_sec = xyes; then
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "gmp.h"
+int
+main ()
+{
+
+				void *x = mpz_powm_sec;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; $as_echo "#define HAVE_MPZ_POWM_SEC 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
+	fi
+	LIBS=$saved_LIBS
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gmp.h version >= 4.1.4" >&5
 $as_echo_n "checking gmp.h version >= 4.1.4... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15145,6 +15513,56 @@ fi
 
 fi
 
+if test x$android = xtrue; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcutils" >&5
+$as_echo_n "checking for main in -lcutils... " >&6; }
+if test "${ac_cv_lib_cutils_main+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcutils  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_cutils_main=yes
+else
+  ac_cv_lib_cutils_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cutils_main" >&5
+$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
+fi
+ac_cv_lib_cutils=ac_cv_lib_cutils_main
+
+	ac_fn_c_check_header_mongrel "$LINENO" "cutils/properties.h" "ac_cv_header_cutils_properties_h" "$ac_includes_default"
+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
+fi
+
+
+			DLLIB="-ldl"
+
+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
@@ -15488,6 +15906,7 @@ fi
 
 
 libstrongswan_plugins=
+libhydra_plugins=
 pluto_plugins=
 
 if test x$test_vectors = xtrue; then
@@ -15529,9 +15948,6 @@ if test x$md5 = xtrue; then
 	libstrongswan_plugins=${libstrongswan_plugins}" md5"
 	pluto_plugins=${pluto_plugins}" md5"
 fi
-if test x$fips_prf = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" fips-prf"
-fi
 if test x$random = xtrue; then
 	libstrongswan_plugins=${libstrongswan_plugins}" random"
 	pluto_plugins=${pluto_plugins}" random"
@@ -15568,10 +15984,6 @@ if test x$sqlite = xtrue; then
 	libstrongswan_plugins=${libstrongswan_plugins}" sqlite"
 	pluto_plugins=${pluto_plugins}" sqlite"
 fi
-if test x$attr_sql = xtrue -o x$sql = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" attr-sql"
-	pluto_plugins=${pluto_plugins}" attr-sql"
-fi
 if test x$padlock = xtrue; then
 	libstrongswan_plugins=${libstrongswan_plugins}" padlock"
 fi
@@ -15583,6 +15995,9 @@ if test x$gcrypt = xtrue; then
 	libstrongswan_plugins=${libstrongswan_plugins}" gcrypt"
 	pluto_plugins=${pluto_plugins}" gcrypt"
 fi
+if test x$fips_prf = xtrue; then
+	libstrongswan_plugins=${libstrongswan_plugins}" fips-prf"
+fi
 if test x$xcbc = xtrue; then
 	libstrongswan_plugins=${libstrongswan_plugins}" xcbc"
 fi
@@ -15597,6 +16012,15 @@ if test x$gmp = xtrue; then
 	libstrongswan_plugins=${libstrongswan_plugins}" gmp"
 	pluto_plugins=${pluto_plugins}" gmp"
 fi
+if test x$attr = xtrue; then
+	libhydra_plugins=${libhydra_plugins}" attr"
+	pluto_plugins=${pluto_plugins}" attr"
+fi
+if test x$attr_sql = xtrue -o x$sql = xtrue; then
+	libhydra_plugins=${libhydra_plugins}" attr-sql"
+	pluto_plugins=${pluto_plugins}" attr-sql"
+fi
+
 
 
 
@@ -15867,6 +16291,14 @@ else
   USE_UCI_FALSE=
 fi
 
+ if test x$android = xtrue; then
+  USE_ANDROID_TRUE=
+  USE_ANDROID_FALSE='#'
+else
+  USE_ANDROID_TRUE='#'
+  USE_ANDROID_FALSE=
+fi
+
  if test x$smp = xtrue; then
   USE_SMP_TRUE=
   USE_SMP_FALSE='#'
@@ -15899,6 +16331,14 @@ else
   USE_ATTR_FALSE=
 fi
 
+ if test x$dhcp = xtrue; then
+  USE_DHCP_TRUE=
+  USE_DHCP_FALSE='#'
+else
+  USE_DHCP_TRUE='#'
+  USE_DHCP_FALSE=
+fi
+
  if test x$resolve = xtrue; then
   USE_RESOLVE_TRUE=
   USE_RESOLVE_FALSE='#'
@@ -15923,6 +16363,14 @@ else
   USE_LOAD_TESTER_FALSE=
 fi
 
+ if test x$ha = xtrue; then
+  USE_HA_TRUE=
+  USE_HA_FALSE='#'
+else
+  USE_HA_TRUE='#'
+  USE_HA_FALSE=
+fi
+
  if test x$eap_sim = xtrue; then
   USE_EAP_SIM_TRUE=
   USE_EAP_SIM_FALSE='#'
@@ -16043,6 +16491,38 @@ else
   USE_KERNEL_KLIPS_FALSE=
 fi
 
+ if test x$socket_default = xtrue; then
+  USE_SOCKET_DEFAULT_TRUE=
+  USE_SOCKET_DEFAULT_FALSE='#'
+else
+  USE_SOCKET_DEFAULT_TRUE='#'
+  USE_SOCKET_DEFAULT_FALSE=
+fi
+
+ if test x$socket_raw = xtrue; then
+  USE_SOCKET_RAW_TRUE=
+  USE_SOCKET_RAW_FALSE='#'
+else
+  USE_SOCKET_RAW_TRUE='#'
+  USE_SOCKET_RAW_FALSE=
+fi
+
+ if test x$socket_dynamic = xtrue; then
+  USE_SOCKET_DYNAMIC_TRUE=
+  USE_SOCKET_DYNAMIC_FALSE='#'
+else
+  USE_SOCKET_DYNAMIC_TRUE='#'
+  USE_SOCKET_DYNAMIC_FALSE=
+fi
+
+ if test x$farp = xtrue; then
+  USE_FARP_TRUE=
+  USE_FARP_FALSE='#'
+else
+  USE_FARP_TRUE='#'
+  USE_FARP_FALSE=
+fi
+
 
  if test x$smartcard = xtrue; then
   USE_SMARTCARD_TRUE=
@@ -16196,6 +16676,14 @@ else
   USE_LIBSTRONGSWAN_FALSE=
 fi
 
+ if test x$charon = xtrue -o x$pluto = xtrue; then
+  USE_LIBHYDRA_TRUE=
+  USE_LIBHYDRA_FALSE='#'
+else
+  USE_LIBHYDRA_TRUE='#'
+  USE_LIBHYDRA_FALSE=
+fi
+
  if test x$pluto = xtrue -o x$stroke = xtrue; then
   USE_FILE_CONFIG_TRUE=
   USE_FILE_CONFIG_FALSE='#'
@@ -16220,6 +16708,14 @@ else
   USE_SIMAKA_FALSE=
 fi
 
+ if test x$monolithic = xtrue; then
+  MONOLITHIC_TRUE=
+  MONOLITHIC_FALSE='#'
+else
+  MONOLITHIC_TRUE='#'
+  MONOLITHIC_FALSE=
+fi
+
 
 
 if test x$mediation = xtrue; then
@@ -16230,9 +16726,14 @@ if test x$capabilities = xlibcap; then
 	$as_echo "#define CAPABILITIES 1" >>confdefs.h
 
 fi
+if test x$monolithic = xtrue; then
+	$as_echo "#define MONOLITHIC 1" >>confdefs.h
+
+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/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/attr_sql/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/libfreeswan/Makefile src/libsimaka/Makefile src/pluto/Makefile src/whack/Makefile src/charon/Makefile src/charon/plugins/eap_aka/Makefile src/charon/plugins/eap_aka_3gpp2/Makefile src/charon/plugins/eap_identity/Makefile src/charon/plugins/eap_md5/Makefile src/charon/plugins/eap_gtc/Makefile src/charon/plugins/eap_sim/Makefile src/charon/plugins/eap_sim_file/Makefile src/charon/plugins/eap_simaka_pseudonym/Makefile src/charon/plugins/eap_simaka_reauth/Makefile src/charon/plugins/eap_mschapv2/Makefile src/charon/plugins/eap_radius/Makefile src/charon/plugins/kernel_netlink/Makefile src/charon/plugins/kernel_pfkey/Makefile src/charon/plugins/kernel_pfroute/Makefile src/charon/plugins/kernel_klips/Makefile src/charon/plugins/smp/Makefile src/charon/plugins/sql/Makefile src/charon/plugins/medsrv/Makefile src/charon/plugins/medcli/Makefile src/charon/plugins/nm/Makefile src/charon/plugins/uci/Makefile src/charon/plugins/stroke/Makefile src/charon/plugins/updown/Makefile src/charon/plugins/attr/Makefile src/charon/plugins/resolve/Makefile src/charon/plugins/unit_tester/Makefile src/charon/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 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/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/libfreeswan/Makefile src/libsimaka/Makefile src/pluto/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_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/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/resolve/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
@@ -16516,6 +17017,10 @@ if test -z "${USE_UCI_TRUE}" && test -z "${USE_UCI_FALSE}"; then
   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.
+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.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16532,6 +17037,10 @@ if test -z "${USE_ATTR_TRUE}" && test -z "${USE_ATTR_FALSE}"; then
   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_DHCP_TRUE}" && test -z "${USE_DHCP_FALSE}"; then
+  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_RESOLVE_TRUE}" && test -z "${USE_RESOLVE_FALSE}"; then
   as_fn_error "conditional \"USE_RESOLVE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16544,6 +17053,10 @@ if test -z "${USE_LOAD_TESTER_TRUE}" && test -z "${USE_LOAD_TESTER_FALSE}"; then
   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.
+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.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16604,6 +17117,22 @@ if test -z "${USE_KERNEL_KLIPS_TRUE}" && test -z "${USE_KERNEL_KLIPS_FALSE}"; th
   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_SOCKET_DEFAULT_TRUE}" && test -z "${USE_SOCKET_DEFAULT_FALSE}"; then
+  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.
+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.
+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.
+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.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16680,6 +17209,10 @@ if test -z "${USE_LIBSTRONGSWAN_TRUE}" && test -z "${USE_LIBSTRONGSWAN_FALSE}";
   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.
+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.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16692,6 +17225,10 @@ if test -z "${USE_SIMAKA_TRUE}" && test -z "${USE_SIMAKA_FALSE}"; then
   as_fn_error "conditional \"USE_SIMAKA\" 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.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
@@ -17100,7 +17637,7 @@ 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.3.6, which was
+This file was extended by strongSwan $as_me 4.4.0, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17155,7 +17692,7 @@ Report bugs to the package provider."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-strongSwan config.status 4.3.6
+strongSwan config.status 4.4.0
 configured by $0, generated by GNU Autoconf 2.64,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -17548,44 +18085,53 @@ do
     "src/libstrongswan/plugins/ldap/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/ldap/Makefile" ;;
     "src/libstrongswan/plugins/mysql/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/mysql/Makefile" ;;
     "src/libstrongswan/plugins/sqlite/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/sqlite/Makefile" ;;
-    "src/libstrongswan/plugins/attr_sql/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/attr_sql/Makefile" ;;
     "src/libstrongswan/plugins/padlock/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/padlock/Makefile" ;;
     "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/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/libfreeswan/Makefile") CONFIG_FILES="$CONFIG_FILES src/libfreeswan/Makefile" ;;
     "src/libsimaka/Makefile") CONFIG_FILES="$CONFIG_FILES src/libsimaka/Makefile" ;;
     "src/pluto/Makefile") CONFIG_FILES="$CONFIG_FILES src/pluto/Makefile" ;;
     "src/whack/Makefile") CONFIG_FILES="$CONFIG_FILES src/whack/Makefile" ;;
     "src/charon/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/Makefile" ;;
-    "src/charon/plugins/eap_aka/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/eap_aka/Makefile" ;;
-    "src/charon/plugins/eap_aka_3gpp2/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/eap_aka_3gpp2/Makefile" ;;
-    "src/charon/plugins/eap_identity/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/eap_identity/Makefile" ;;
-    "src/charon/plugins/eap_md5/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/eap_md5/Makefile" ;;
-    "src/charon/plugins/eap_gtc/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/eap_gtc/Makefile" ;;
-    "src/charon/plugins/eap_sim/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/eap_sim/Makefile" ;;
-    "src/charon/plugins/eap_sim_file/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/eap_sim_file/Makefile" ;;
-    "src/charon/plugins/eap_simaka_pseudonym/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/eap_simaka_pseudonym/Makefile" ;;
-    "src/charon/plugins/eap_simaka_reauth/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/eap_simaka_reauth/Makefile" ;;
-    "src/charon/plugins/eap_mschapv2/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/eap_mschapv2/Makefile" ;;
-    "src/charon/plugins/eap_radius/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/eap_radius/Makefile" ;;
-    "src/charon/plugins/kernel_netlink/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/kernel_netlink/Makefile" ;;
-    "src/charon/plugins/kernel_pfkey/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/kernel_pfkey/Makefile" ;;
-    "src/charon/plugins/kernel_pfroute/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/kernel_pfroute/Makefile" ;;
-    "src/charon/plugins/kernel_klips/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/kernel_klips/Makefile" ;;
-    "src/charon/plugins/smp/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/smp/Makefile" ;;
-    "src/charon/plugins/sql/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/sql/Makefile" ;;
-    "src/charon/plugins/medsrv/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/medsrv/Makefile" ;;
-    "src/charon/plugins/medcli/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/medcli/Makefile" ;;
-    "src/charon/plugins/nm/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/nm/Makefile" ;;
-    "src/charon/plugins/uci/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/uci/Makefile" ;;
-    "src/charon/plugins/stroke/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/stroke/Makefile" ;;
-    "src/charon/plugins/updown/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/updown/Makefile" ;;
-    "src/charon/plugins/attr/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/attr/Makefile" ;;
-    "src/charon/plugins/resolve/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/resolve/Makefile" ;;
-    "src/charon/plugins/unit_tester/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/unit_tester/Makefile" ;;
-    "src/charon/plugins/load_tester/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/plugins/load_tester/Makefile" ;;
+    "src/libcharon/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/Makefile" ;;
+    "src/libcharon/plugins/eap_aka/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_aka/Makefile" ;;
+    "src/libcharon/plugins/eap_aka_3gpp2/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_aka_3gpp2/Makefile" ;;
+    "src/libcharon/plugins/eap_identity/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_identity/Makefile" ;;
+    "src/libcharon/plugins/eap_md5/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_md5/Makefile" ;;
+    "src/libcharon/plugins/eap_gtc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_gtc/Makefile" ;;
+    "src/libcharon/plugins/eap_sim/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_sim/Makefile" ;;
+    "src/libcharon/plugins/eap_sim_file/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_sim_file/Makefile" ;;
+    "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_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/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" ;;
+    "src/libcharon/plugins/farp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/farp/Makefile" ;;
+    "src/libcharon/plugins/smp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/smp/Makefile" ;;
+    "src/libcharon/plugins/sql/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/sql/Makefile" ;;
+    "src/libcharon/plugins/medsrv/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/medsrv/Makefile" ;;
+    "src/libcharon/plugins/medcli/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/medcli/Makefile" ;;
+    "src/libcharon/plugins/nm/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/nm/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/android/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/android/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" ;;
+    "src/libcharon/plugins/resolve/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/resolve/Makefile" ;;
+    "src/libcharon/plugins/unit_tester/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/unit_tester/Makefile" ;;
+    "src/libcharon/plugins/load_tester/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/load_tester/Makefile" ;;
     "src/stroke/Makefile") CONFIG_FILES="$CONFIG_FILES src/stroke/Makefile" ;;
     "src/ipsec/Makefile") CONFIG_FILES="$CONFIG_FILES src/ipsec/Makefile" ;;
     "src/starter/Makefile") CONFIG_FILES="$CONFIG_FILES src/starter/Makefile" ;;