Updated to new upstream release. interfaces Patch is not from upstream.

1 files changed, 245 insertions, 732 deletions

diff --git a/configure.in b/configure.in
index f677cb622..8ba844e9b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,12 +1,12 @@
 dnl  configure.in for linux strongSwan
 dnl  Copyright (C) 2006 Martin Willi
 dnl  Hochschule fuer Technik Rapperswil
-dnl 
+dnl
 dnl  This program is free software; you can redistribute it and/or modify it
 dnl  under the terms of the GNU General Public License as published by the
 dnl  Free Software Foundation; either version 2 of the License, or (at your
 dnl  option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-dnl 
+dnl
 dnl  This program is distributed in the hope that it will be useful, but
 dnl  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 dnl  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
@@ -16,21 +16,31 @@ dnl ===========================
 dnl  initialize & set some vars
 dnl ===========================
 
-AC_INIT(strongSwan,4.3.4)
+AC_INIT(strongSwan,4.3.6)
 AM_INIT_AUTOMAKE(tar-ustar)
-AC_SUBST(confdir, '${sysconfdir}')
+AC_CONFIG_MACRO_DIR([m4/config])
 PKG_PROG_PKG_CONFIG
 
 dnl =================================
 dnl  check --enable-xxx & --with-xxx
 dnl =================================
 
-AC_ARG_WITH(
-	[default-pkcs11],
-	AS_HELP_STRING([--with-default-pkcs11=lib],[set the default PKCS11 library other than "/usr/lib/opensc-pkcs11.so"]),
-	[AC_DEFINE_UNQUOTED(PKCS11_DEFAULT_LIB, "$withval")],
-	[AC_DEFINE_UNQUOTED(PKCS11_DEFAULT_LIB, "/usr/lib/opensc-pkcs11.so")]
-)
+m4_include(m4/macros/with.m4)
+
+ARG_WITH_SUBST([default-pkcs11],     [/usr/lib/opensc-pkcs11.so], [set the default PKCS11 library])
+ARG_WITH_SUBST([random-device],      [/dev/random], [set the device to read real random data from])
+ARG_WITH_SUBST([urandom-device],     [/dev/urandom], [set the device to read pseudo random data from])
+ARG_WITH_SUBST([strongswan-conf],    [${sysconfdir}/strongswan.conf], [set the strongswan.conf file location])
+ARG_WITH_SUBST([resolv-conf],        [${sysconfdir}/resolv.conf], [set the file to use in DNS handler plugin])
+ARG_WITH_SUBST([piddir],             [/var/run], [set path for PID and UNIX socket files])
+ARG_WITH_SUBST([ipsecdir],           [${libexecdir%/}/ipsec], [set installation path for ipsec tools])
+ARG_WITH_SUBST([plugindir],          [${ipsecdir%/}/plugins], [set the installation path of plugins])
+ARG_WITH_SUBST([nm-ca-dir],          [/usr/share/ca-certificates], [directory the NM plugin uses to look up trusted root certificates])
+ARG_WITH_SUBST([linux-headers],      [\${top_srcdir}/src/include], [set directory of linux header files to use])
+ARG_WITH_SUBST([routing-table],      [220], [set routing table to use for IPsec routes])
+ARG_WITH_SUBST([routing-table-prio], [220], [set priority for IPsec routing table])
+
+ARG_WITH_SET([capabilities],         [no], [set capability dropping library. Currently only the value "libcap" is supported])
 
 AC_ARG_WITH(
 	[xauth-module],
@@ -39,91 +49,6 @@ AC_ARG_WITH(
 )
 
 AC_ARG_WITH(
-	[random-device],
-	AS_HELP_STRING([--with-random-device=dev],[set the device for real random data other than "/dev/random"]),
-	[AC_DEFINE_UNQUOTED(DEV_RANDOM, "$withval")],
-	[AC_DEFINE_UNQUOTED(DEV_RANDOM, "/dev/random")]
-)
-AC_ARG_WITH(
-	[resolv-conf],
-	AS_HELP_STRING([--with-resolv-conf=file],[set the file to use in DNS handler plugin other than "sysconfdir/resolv.conf"]),
-	[AC_SUBST(resolv_conf, "$withval")],
-	[AC_SUBST(resolv_conf, "${sysconfdir}/resolv.conf")]
-)
-
-AC_ARG_WITH(
-	[strongswan-conf],
-	AS_HELP_STRING([--with-strongswan-conf=file],[strongswan.conf file other than "sysconfdir/strongswan.conf"]),
-	[AC_SUBST(strongswan_conf, "$withval")],
-	[AC_SUBST(strongswan_conf, "${sysconfdir}/strongswan.conf")]
-)
-
-AC_ARG_WITH(
-	[urandom-device],
-	AS_HELP_STRING([--with-urandom-device=dev],[set the device for pseudo random data other than "/dev/urandom"]),
-	[AC_DEFINE_UNQUOTED(DEV_URANDOM, "$withval")],
-	[AC_DEFINE_UNQUOTED(DEV_URANDOM, "/dev/urandom")]
-)
-
-AC_ARG_WITH(
-	[piddir],
-	AS_HELP_STRING([--with-piddir=dir],[path for PID and UNIX socket files other than "/var/run"]),
-	[AC_SUBST(piddir, "$withval")],
-	[AC_SUBST(piddir, "/var/run")]
-)
-
-AC_ARG_WITH(
-	[ipsecdir],
-	AS_HELP_STRING([--with-ipsecdir=dir],[installation path for ipsec tools other than "libexecdir/ipsec"]),
-	[AC_SUBST(ipsecdir, "$withval")],
-	[AC_SUBST(ipsecdir, "${libexecdir%/}/ipsec")]
-)
-AC_SUBST(plugindir, "${ipsecdir%/}/plugins")
-
-AC_ARG_WITH(
-	[plugindir],
-	AS_HELP_STRING([--with-plugindir=dir],[installation path for plugins other than "ipsecdir/plugins"]),
-	[AC_SUBST(plugindir, "$withval")],
-	[AC_SUBST(plugindir, "${ipsecdir%/}/plugins")]
-)
-
-AC_ARG_WITH(
-	[sim-reader],
-	AS_HELP_STRING([--with-sim-reader=library.so],[library containing the sim_run_alg()/sim_get_triplet() function for EAP-SIM]),
-	[AC_SUBST(simreader, "$withval")],
-	[AC_SUBST(simreader, "${plugindir%/}/libeapsim-file.so")]
-)
-
-AC_ARG_WITH(
-	[linux-headers],
-	AS_HELP_STRING([--with-linux-headers=dir],[use the linux header files in dir instead of the supplied ones in "src/include"]),
-	[AC_SUBST(linuxdir, "$withval")], [AC_SUBST(linuxdir, "\${top_srcdir}/src/include")]
-)
-AC_SUBST(LINUX_HEADERS)
-
-AC_ARG_WITH(
-	[routing-table],
-	AS_HELP_STRING([--with-routing-table=num],[use routing table for IPsec routes (default: 220)]),
-	[AC_DEFINE_UNQUOTED(IPSEC_ROUTING_TABLE, $withval) AC_SUBST(IPSEC_ROUTING_TABLE, "$withval")], 
-	[AC_DEFINE_UNQUOTED(IPSEC_ROUTING_TABLE, 220) AC_SUBST(IPSEC_ROUTING_TABLE, "220")]
-)
-
-AC_ARG_WITH(
-	[routing-table-prio],
-	AS_HELP_STRING([--with-routing-table-prio=prio],[priority for IPsec routing table (default: 220)]),
-	[AC_DEFINE_UNQUOTED(IPSEC_ROUTING_TABLE_PRIO, $withval) AC_SUBST(IPSEC_ROUTING_TABLE_PRIO, "$withval")], 
-	[AC_DEFINE_UNQUOTED(IPSEC_ROUTING_TABLE_PRIO, 220) AC_SUBST(IPSEC_ROUTING_TABLE_PRIO, "220")]
-)
-
-AC_ARG_WITH(
-	[uid],,[AC_MSG_ERROR([--with-uid is gone, use --with-user instead!])]
-)
-
-AC_ARG_WITH(
-	[gid],,[AC_MSG_ERROR([--with-gid is gone, use --with-group instead!])]
-)
-
-AC_ARG_WITH(
 	[user],
 	AS_HELP_STRING([--with-user=user],[change user of the daemons to "user" after startup (default is "root").]),
 	[AC_DEFINE_UNQUOTED(IPSEC_USER, "$withval") AC_SUBST(ipsecuser, "$withval")],
@@ -137,614 +62,81 @@ AC_ARG_WITH(
 	[AC_SUBST(ipsecgroup, "root")]
 )
 
-dnl Will be extended to --with-capabilities=libcap|libcap2
-AC_ARG_WITH(
-	[capabilities],
-	AS_HELP_STRING([--with-capabilities=libcap],[capability dropping using libcap. Currenlty only the value "libcap" is supported (default is NO).]),
-	[capabilities="$withval"],
-	[capabilities=no]
-)
-
-AC_ARG_ENABLE(
-	[curl],
-	AS_HELP_STRING([--enable-curl],[enable CURL fetcher plugin to fetch files via libcurl (default is NO). Requires libcurl.]),
-	[if test x$enableval = xyes; then
-		curl=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[ldap],
-	AS_HELP_STRING([--enable-ldap],[enable LDAP fetching plugin to fetch files via libldap (default is NO). Requires openLDAP.]),
-	[if test x$enableval = xyes; then
-		ldap=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[aes],
-	AS_HELP_STRING([--disable-aes],[disable own AES software implementation plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		aes=true
-	 else
-		aes=false
-	fi],
-	aes=true
-)
-
-AC_ARG_ENABLE(
-	[des],
-	AS_HELP_STRING([--disable-des],[disable own DES/3DES software implementation plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		des=true
-	 else
-		des=false
-	fi],
-	des=true
-)
-
-AC_ARG_ENABLE(
-	[blowfish],
-	AS_HELP_STRING([--enable-blowfish],[enable Blowfish software implementation plugin (default is NO).]),
-	[if test x$enableval = xyes; then
-		blowfish=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[md4],
-	AS_HELP_STRING([--enable-md4],[enable MD4 software implementation plugin (default is NO).]),
-	[if test x$enableval = xyes; then
-		md4=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[md5],
-	AS_HELP_STRING([--disable-md5],[disable own MD5 software implementation plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		md5=true
-	 else
-		md5=false
-	fi],
-	md5=true
-)
-
-AC_ARG_ENABLE(
-	[sha1],
-	AS_HELP_STRING([--disable-sha1],[disable own SHA1 software implementation plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		sha1=true
-	 else
-		sha1=false
-	fi],
-	sha1=true
-)
-
-AC_ARG_ENABLE(
-	[sha2],
-	AS_HELP_STRING([--disable-sha2],[disable own SHA256/SHA384/SHA512 software implementation plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		sha2=true
-	 else
-		sha2=false
-	fi],
-	sha2=true
-)
-
-AC_ARG_ENABLE(
-	[fips-prf],
-	AS_HELP_STRING([--disable-fips-prf],[disable FIPS PRF software implementation plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		fips_prf=true
-	 else
-		fips_prf=false
-	fi],
-	fips_prf=true
-)
-
-AC_ARG_ENABLE(
-	[gmp],
-	AS_HELP_STRING([--disable-gmp],[disable own GNU MP (libgmp) based crypto implementation plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		gmp=true
-	 else
-		gmp=false
-	fi],
-	gmp=true
-)
-
-AC_ARG_ENABLE(
-	[random],
-	AS_HELP_STRING([--disable-random],[disable RNG implementation on top of /dev/(u)random. (default is NO).]),
-	[if test x$enableval = xyes; then
-		random=true
-	 else
-		random=false
-	fi],
-	random=true
-)
-
-AC_ARG_ENABLE(
-	[x509],
-	AS_HELP_STRING([--disable-x509],[disable own X509 certificate implementation plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		x509=true
-	 else
-		x509=false
-	fi],
-	x509=true
-)
-
-AC_ARG_ENABLE(
-	[pubkey],
-	AS_HELP_STRING([--disable-pubkey],[disable RAW public key support plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		pubkey=true
-	 else
-		pubkey=false
-	fi],
-	pubkey=true
-)
-
-AC_ARG_ENABLE(
-	[hmac],
-	AS_HELP_STRING([--disable-hmac],[disable HMAC crypto implementation plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		hmac=true
-	 else
-		hmac=false
-	fi],
-	hmac=true
-)
-
-AC_ARG_ENABLE(
-	[xcbc],
-	AS_HELP_STRING([--disable-xcbc],[disable xcbc crypto implementation plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		xcbc=true
-	 else
-		xcbc=false
-	fi],
-	xcbc=true
-)
-
-AC_ARG_ENABLE(
-	[test-vectors],
-	AS_HELP_STRING([--enable-test-vectors],[enable plugin providing crypto test vectors (default is NO).]),
-	[if test x$enableval = xyes; then
-		test_vectors=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[mysql],
-	AS_HELP_STRING([--enable-mysql],[enable MySQL database support (default is NO). Requires libmysqlclient_r.]),
-	[if test x$enableval = xyes; then
-		mysql=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[sqlite],
-	AS_HELP_STRING([--enable-sqlite],[enable SQLite database support (default is NO). Requires libsqlite3.]),
-	[if test x$enableval = xyes; then
-		sqlite=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[stroke],
-	AS_HELP_STRING([--disable-stroke],[disable charons stroke (pluto compatibility) configuration backend. (default is NO).]),
-	[if test x$enableval = xyes; then
-		stroke=true
-	 else
-		stroke=false
-	fi],
-	stroke=true
-)
-
-AC_ARG_ENABLE(
-	[medsrv],
-	AS_HELP_STRING([--enable-medsrv],[enable mediation server web frontend and daemon plugin (default is NO).]),
-	[if test x$enableval = xyes; then
-		medsrv=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[medcli],
-	AS_HELP_STRING([--enable-medcli],[enable mediation client configuration database plugin (default is NO).]),
-	[if test x$enableval = xyes; then
-		medcli=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[smp],
-	AS_HELP_STRING([--enable-smp],[enable SMP configuration and control interface (default is NO). Requires libxml.]),
-	[if test x$enableval = xyes; then
-		smp=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[sql],
-	AS_HELP_STRING([--enable-sql],[enable SQL database configuration backend (default is NO).]),
-	[if test x$enableval = xyes; then
-		sql=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[smartcard],
-	AS_HELP_STRING([--enable-smartcard],[enable smartcard support (default is NO).]),
-	[if test x$enableval = xyes; then
-		smartcard=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[cisco-quirks],
-	AS_HELP_STRING([--enable-cisco-quirks],[enable support of Cisco VPN client (default is NO).]),
-	[if test x$enableval = xyes; then
-		cisco_quirks=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[leak-detective],
-	AS_HELP_STRING([--enable-leak-detective],[enable malloc hooks to find memory leaks (default is NO).]),
-	[if test x$enableval = xyes; then
-		leak_detective=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[lock-profiler],
-	AS_HELP_STRING([--enable-lock-profiler],[enable lock/mutex profiling code (default is NO).]),
-	[if test x$enableval = xyes; then
-		lock_profiler=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[unit-tests],
-	AS_HELP_STRING([--enable-unit-tests],[enable unit tests on IKEv2 daemon startup (default is NO).]),
-	[if test x$enableval = xyes; then
-		unittest=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[load-tests],
-	AS_HELP_STRING([--enable-load-tests],[enable load testing plugin for IKEv2 daemon (default is NO).]),
-	[if test x$enableval = xyes; then
-		loadtest=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[eap-sim],
-	AS_HELP_STRING([--enable-eap-sim],[build SIM authenication module for EAP (default is NO).]),
-	[if test x$enableval = xyes; then
-		eap_sim=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[eap-sim-file],
-	AS_HELP_STRING([--enable-eap-sim-file],[build EAP-SIM backend based on a triplet file (default is NO).]),
-	[if test x$enableval = xyes; then
-		eap_sim_file=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[eap-identity],
-	AS_HELP_STRING([--enable-eap-identity],[build EAP module providing EAP-Identity helper (default is NO).]),
-	[if test x$enableval = xyes; then
-		eap_identity=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[eap-md5],
-	AS_HELP_STRING([--enable-eap-md5],[build MD5 (CHAP) authenication module for EAP (default is NO).]),
-	[if test x$enableval = xyes; then
-		eap_md5=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[eap-gtc],
-	AS_HELP_STRING([--enable-eap-gtc],[build PAM based GTC authenication module for EAP (default is NO).]),
-	[if test x$enableval = xyes; then
-		eap_gtc=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[eap-aka],
-	AS_HELP_STRING([--enable-eap-aka],[build AKA authentication module for EAP (default is NO).]),
-	[if test x$enableval = xyes; then
-		eap_aka=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[eap-mschapv2],
-	AS_HELP_STRING([--enable-eap-mschapv2],[build MS-CHAPv2 authenication module for EAP (default is NO).]),
-	[if test x$enableval = xyes; then
-		eap_mschapv2=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[eap-radius],
-	AS_HELP_STRING([--enable-eap-radius],[build RADIUS proxy authenication module for EAP (default is NO).]),
-	[if test x$enableval = xyes; then
-		eap_radius=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[kernel-netlink],
-	AS_HELP_STRING([--disable-kernel-netlink],[disable the netlink kernel interface. (default is NO).]),
-	[if test x$enableval = xyes; then
-		kernel_netlink=true
-	 else
-		kernel_netlink=false
-	fi],
-	kernel_netlink=true
-)
-
-AC_ARG_ENABLE(
-	[kernel-pfkey],
-	AS_HELP_STRING([--enable-kernel-pfkey],[enable the PF_KEY kernel interface. (default is NO).]),
-	[if test x$enableval = xyes; then
-		kernel_pfkey=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[kernel-pfroute],
-	AS_HELP_STRING([--enable-kernel-pfroute],[enable the PF_ROUTE kernel interface. (default is NO).]),
-	[if test x$enableval = xyes; then
-		kernel_pfroute=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[kernel-klips],
-	AS_HELP_STRING([--enable-kernel-klips],[enable the KLIPS kernel interface. (default is NO).]),
-	[if test x$enableval = xyes; then
-		kernel_klips=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[nat-transport],
-	AS_HELP_STRING([--enable-nat-transport],[enable NAT traversal with IPsec transport mode (default is NO).]),
-	[if test x$enableval = xyes; then
-		nat_transport=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[vendor-id],
-	AS_HELP_STRING([--disable-vendor-id],[disable the sending of the strongSwan vendor ID (default is NO).]),
-	[if test x$enableval = xyes; then
-		vendor_id=true
-	 else
-		vendor_id=false
-	fi],
-	vendor_id=true
-)
-
-AC_ARG_ENABLE(
-	[xauth-vid],
-	AS_HELP_STRING([--disable-xauth-vid],[disable the sending of the XAUTH vendor ID (default is NO).]),
-	[if test x$enableval = xyes; then
-		xauth_vid=true
-	 else
-		xauth_vid=false
-	fi],
-	xauth_vid=true
-)
-
-AC_ARG_ENABLE(
-	[dumm],
-	AS_HELP_STRING([--enable-dumm],[build the DUMM UML test framework (default is NO).]),
-	[if test x$enableval = xyes; then
-		dumm=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[fast],
-	AS_HELP_STRING([--enable-fast],[build libfast (FastCGI Application Server w/ templates (default is NO).]),
-	[if test x$enableval = xyes; then
-		fast=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[manager],
-	AS_HELP_STRING([--enable-manager],[build web management console (default is NO).]),
-	[if test x$enableval = xyes; then
-		manager=true
-		xml=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[mediation],
-	AS_HELP_STRING([--enable-mediation],[enable IKEv2 Mediation Extension (default is NO).]),
-	[if test x$enableval = xyes; then
-		me=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[integrity-test],
-	AS_HELP_STRING([--enable-integrity-test],[enable integrity testing of libstrongswan and plugins (default is NO).]),
-	[if test x$enableval = xyes; then
-		integrity_test=true 
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[pluto],
-	AS_HELP_STRING([--disable-pluto],[disable the IKEv1 keying daemon pluto. (default is NO).]),
-	[if test x$enableval = xyes; then
-		pluto=true
-	 else
-		pluto=false
-	fi],
-	pluto=true
-)
-
-AC_ARG_ENABLE(
-	[threads],
-	AS_HELP_STRING([--disable-threads],[disable the use of threads in pluto. Charon always uses threads. (default is NO).]),
-	[if test x$enableval = xyes; then
-		threads=true
-	 else
-		threads=false
-	fi],
-	threads=true
-)
-
-AC_ARG_ENABLE(
-	[charon],
-	AS_HELP_STRING([--disable-charon],[disable the IKEv2 keying daemon charon. (default is NO).]),
-	[if test x$enableval = xyes; then
-		charon=true
-	 else
-		charon=false
-	fi],
-	charon=true
-)
-
-AC_ARG_ENABLE(
-	[tools],
-	AS_HELP_STRING([--disable-tools],[disable additional utilities (openac and scepclient). (default is NO).]),
-	[if test x$enableval = xyes; then
-		tools=true
-	 else
-		tools=false
-	fi],
-	tools=true
-)
-
-AC_ARG_ENABLE(
-	[scripts],
-	AS_HELP_STRING([--disable-scripts],[disable additional utilities (found in directory scripts). (default is NO).]),
-	[if test x$enableval = xyes; then
-		scripts=true
-	 else
-		scripts=false
-	fi],
-	scripts=true
-)
-
-AC_ARG_ENABLE(
-	[updown],
-	AS_HELP_STRING([--disable-updown],[disable updown firewall script plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		updown=true
-	 else
-		updown=false
-	fi],
-	updown=true
-)
-
-AC_ARG_ENABLE(
-	[attr],
-	AS_HELP_STRING([--disable-attr],[disable strongswan.conf based configuration attribute plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		attr=true
-	 else
-		attr=false
-	fi],
-	attr=true
-)
-
-AC_ARG_ENABLE(
-	[resolv-conf],
-	AS_HELP_STRING([--disable-resolv-conf],[disable resolv.conf DNS handler plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		resolvconf=true
-	 else
-		resolvconf=false
-	fi],
-	resolvconf=true
-)
-
-AC_ARG_ENABLE(
-	[padlock],
-	AS_HELP_STRING([--enable-padlock],[enables VIA Padlock crypto plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		padlock=true
-	 else
-		padlock=false
-	fi],
-)
-
-AC_ARG_ENABLE(
-	[openssl],
-	AS_HELP_STRING([--enable-openssl],[enables the OpenSSL crypto plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		openssl=true
-	 else
-		openssl=false
-	fi],
-)
-
-AC_ARG_ENABLE(
-	[gcrypt],
-	AS_HELP_STRING([--enable-gcrypt],[enables the libgcrypt plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		gcrypt=true
-	 else
-		gcrypt=false
-	fi],
-)
-
-AC_ARG_ENABLE(
-	[agent],
-	AS_HELP_STRING([--enable-agent],[enables the ssh-agent signing plugin. (default is NO).]),
-	[if test x$enableval = xyes; then
-		agent=true
-	 else
-		agent=false
-	fi],
-)
-
-AC_ARG_ENABLE(
-	[uci],
-	AS_HELP_STRING([--enable-uci],[enable OpenWRT UCI configuration plugin (default is NO).]),
-	[if test x$enableval = xyes; then
-		uci=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[nm],
-	AS_HELP_STRING([--enable-nm],[enable NetworkManager plugin (default is NO).]),
-	[if test x$enableval = xyes; then
-		nm=true
-	fi]
-)
-
-AC_ARG_ENABLE(
-	[vstr],
-	AS_HELP_STRING([--enable-vstr],[enforce using the Vstr string library to replace glibc-like printf hooks (default is NO).]),
-	[if test x$enableval = xyes; then
-	 	vstr=true
-	fi]
-)
+m4_include(m4/macros/enable-disable.m4)
+
+ARG_ENABL_SET([curl],           [enable CURL fetcher plugin to fetch files via libcurl. Requires libcurl.])
+ARG_ENABL_SET([ldap],           [enable LDAP fetching plugin to fetch files via libldap. Requires openLDAP.])
+ARG_DISBL_SET([aes],            [disable AES software implementation plugin.])
+ARG_DISBL_SET([des],            [disable DES/3DES software implementation plugin.])
+ARG_ENABL_SET([blowfish],       [enable Blowfish software implementation plugin.])
+ARG_ENABL_SET([md4],            [enable MD4 software implementation plugin.])
+ARG_DISBL_SET([md5],            [disable MD5 software implementation plugin.])
+ARG_DISBL_SET([sha1],           [disable SHA1 software implementation plugin.])
+ARG_DISBL_SET([sha2],           [disable SHA256/SHA384/SHA512 software implementation plugin.])
+ARG_DISBL_SET([fips-prf],       [disable FIPS PRF software implementation plugin.])
+ARG_DISBL_SET([gmp],            [disable GNU MP (libgmp) based crypto implementation plugin.])
+ARG_DISBL_SET([random],         [disable RNG implementation on top of /dev/(u)random.])
+ARG_DISBL_SET([x509],           [disable X509 certificate implementation plugin.])
+ARG_DISBL_SET([pubkey],         [disable RAW public key support plugin.])
+ARG_DISBL_SET([pkcs1],          [disable PKCS1 key decoding plugin.])
+ARG_DISBL_SET([pgp],            [disable PGP key decoding plugin.])
+ARG_DISBL_SET([dnskey],         [disable DNS RR key decoding plugin.])
+ARG_DISBL_SET([pem],            [disable PEM decoding plugin.])
+ARG_DISBL_SET([hmac],           [disable HMAC crypto implementation plugin.])
+ARG_DISBL_SET([xcbc],           [disable xcbc crypto implementation plugin.])
+ARG_ENABL_SET([test-vectors],   [enable plugin providing crypto test vectors.])
+ARG_ENABL_SET([mysql],          [enable MySQL database support. Requires libmysqlclient_r.])
+ARG_ENABL_SET([sqlite],         [enable SQLite database support. Requires libsqlite3.])
+ARG_DISBL_SET([stroke],         [disable charons stroke (pluto compatibility) configuration backend.])
+ARG_ENABL_SET([medsrv],         [enable mediation server web frontend and daemon plugin.])
+ARG_ENABL_SET([medcli],         [enable mediation client configuration database plugin.])
+ARG_ENABL_SET([smp],            [enable SMP configuration and control interface. Requires libxml.])
+ARG_ENABL_SET([sql],            [enable SQL database configuration backend.])
+ARG_ENABL_SET([smartcard],      [enable smartcard support.])
+ARG_ENABL_SET([cisco-quirks],   [enable support of Cisco VPN client.])
+ARG_ENABL_SET([leak-detective], [enable malloc hooks to find memory leaks.])
+ARG_ENABL_SET([lock-profiler],  [enable lock/mutex profiling code.])
+ARG_ENABL_SET([unit-tests],     [enable unit tests on IKEv2 daemon startup.])
+ARG_ENABL_SET([load-tester],    [enable load testing plugin for IKEv2 daemon.])
+ARG_ENABL_SET([eap-sim],        [enable SIM authenication module for EAP.])
+ARG_ENABL_SET([eap-sim-file],   [enable EAP-SIM backend based on a triplet file.])
+ARG_ENABL_SET([eap-simaka-pseudonym], [enable EAP-SIM/AKA pseudonym storage plugin.])
+ARG_ENABL_SET([eap-simaka-reauth],    [enable EAP-SIM/AKA reauthentication data storage plugin.])
+ARG_ENABL_SET([eap-identity],   [enable EAP module providing EAP-Identity helper.])
+ARG_ENABL_SET([eap-md5],        [enable EAP MD5 (CHAP) authenication module.])
+ARG_ENABL_SET([eap-gtc],        [enable PAM based EAP GTC authenication module.])
+ARG_ENABL_SET([eap-aka],        [enable EAP AKA authentication module.])
+ARG_ENABL_SET([eap-aka-3gpp2],  [enable EAP AKA backend implementing 3GPP2 algorithms in software. Requires libgmp.])
+ARG_ENABL_SET([eap-mschapv2],   [enable EAP MS-CHAPv2 authenication module.])
+ARG_ENABL_SET([eap-radius],     [enable RADIUS proxy authenication module.])
+ARG_DISBL_SET([kernel-netlink], [disable the netlink kernel interface.])
+ARG_ENABL_SET([kernel-pfkey],   [enable the PF_KEY kernel interface.])
+ARG_ENABL_SET([kernel-pfroute], [enable the PF_ROUTE kernel interface.])
+ARG_ENABL_SET([kernel-klips],   [enable the KLIPS kernel interface.])
+ARG_ENABL_SET([nat-transport],  [enable NAT traversal with IPsec transport mode in pluto.])
+ARG_DISBL_SET([vendor-id],      [disable the sending of the strongSwan vendor ID in pluto.])
+ARG_DISBL_SET([xauth-vid],      [disable the sending of the XAUTH vendor ID.])
+ARG_ENABL_SET([dumm],           [enable the DUMM UML test framework.])
+ARG_ENABL_SET([fast],           [enable libfast (FastCGI Application Server w/ templates.])
+ARG_ENABL_SET([manager],        [enable web management console (proof of concept).])
+ARG_ENABL_SET([mediation],      [enable IKEv2 Mediation Extension.])
+ARG_ENABL_SET([integrity-test], [enable integrity testing of libstrongswan and plugins.])
+ARG_DISBL_SET([pluto],          [disable the IKEv1 keying daemon pluto.])
+ARG_DISBL_SET([threads],        [disable the use of threads in pluto. Charon always uses threads.])
+ARG_DISBL_SET([charon],         [disable the IKEv2 keying daemon charon.])
+ARG_DISBL_SET([tools],          [disable additional utilities (openac, scepclient and pki).])
+ARG_DISBL_SET([scripts],        [disable additional utilities (found in directory scripts).])
+ARG_DISBL_SET([updown],         [disable updown firewall script plugin.])
+ARG_DISBL_SET([attr],           [disable strongswan.conf based configuration attribute plugin.])
+ARG_ENABL_SET([attr-sql],       [enable SQL based configuration attribute plugin.])
+ARG_DISBL_SET([resolve],        [disable resolve DNS handler plugin.])
+ARG_ENABL_SET([padlock],        [enables VIA Padlock crypto plugin.])
+ARG_ENABL_SET([openssl],        [enables the OpenSSL crypto plugin.])
+ARG_ENABL_SET([gcrypt],         [enables the libgcrypt plugin.])
+ARG_ENABL_SET([agent],          [enables the ssh-agent signing plugin.])
+ARG_ENABL_SET([uci],            [enable OpenWRT UCI configuration plugin.])
+ARG_ENABL_SET([nm],             [enable NetworkManager plugin.])
+ARG_ENABL_SET([vstr],           [enforce using the Vstr string library to replace glibc-like printf hooks.])
 
 dnl =========================
 dnl  set up compiler and flags
@@ -804,24 +196,25 @@ dnl =========================
 dnl  dependency calculation
 dnl =========================
 
-if test x$eap_aka = xtrue; then
+if test x$eap_aka_3gpp2 = xtrue; then
 	gmp=true;
+fi
+
+if test x$eap_aka = xtrue; then
 	fips_prf=true;
 	sha1=true;
+	simaka=true;
 fi
 
 if test x$eap_sim = xtrue; then
 	fips_prf=true;
+	simaka=true;
 fi
 
 if test x$fips_prf = xtrue; then
 	sha1=true;
 fi
 
-if test x$tools = xtrue; then
-	gmp=true;
-fi
-
 if test x$smp = xtrue; then
 	xml=true
 fi
@@ -831,12 +224,12 @@ if test x$manager = xtrue; then
 fi
 
 if test x$medsrv = xtrue; then
-	me=true
+	mediation=true
 	fast=true
 fi
 
 if test x$medcli = xtrue; then
-	me=true
+	mediation=true
 fi
 
 dnl ===========================================
@@ -868,6 +261,17 @@ AC_SEARCH_LIBS(socket, socket, [SOCKLIB=$LIBS],
 )
 AC_SUBST(SOCKLIB)
 
+dnl FreeBSD has clock_gettime in libc, Linux needs librt
+LIBS=""
+AC_SEARCH_LIBS(clock_gettime, rt, [RTLIB=$LIBS])
+AC_CHECK_FUNCS(clock_gettime)
+AC_SUBST(RTLIB)
+
+dnl Android has pthread_* functions in bionic (libc), others need libpthread
+LIBS=""
+AC_SEARCH_LIBS(pthread_create, pthread, [PTHREADLIB=$LIBS])
+AC_SUBST(PTHREADLIB)
+
 LIBS=$saved_LIBS
 dnl ======================
 
@@ -881,6 +285,33 @@ AC_TRY_COMPILE(
 	[AC_MSG_RESULT([no])]
 )
 
+dnl check if pthread_condattr_setclock(CLOCK_MONOTONE) is supported
+saved_LIBS=$LIBS
+LIBS=$PTHREADLIB
+AC_MSG_CHECKING([for pthread_condattr_setclock(CLOCK_MONOTONE)])
+AC_TRY_RUN(
+	[#include <pthread.h>
+	 int main() { pthread_condattr_t attr;
+		pthread_condattr_init(&attr);
+		return pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);}],
+	[AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_CONDATTR_CLOCK_MONOTONIC])],
+	[AC_MSG_RESULT([no])],
+	dnl Check existence of pthread_condattr_setclock if cross-compiling
+	[AC_MSG_RESULT([unknown]);
+	 AC_CHECK_FUNCS(pthread_condattr_setclock,
+		[AC_DEFINE([HAVE_CONDATTR_CLOCK_MONOTONIC])]
+	)]
+)
+dnl check if we actually are able to configure attributes on cond vars
+AC_CHECK_FUNCS(pthread_condattr_init)
+dnl instead of pthread_condattr_setclock Android has this function
+AC_CHECK_FUNCS(pthread_cond_timedwait_monotonic)
+dnl check if we can cancel threads
+AC_CHECK_FUNCS(pthread_cancel)
+dnl check if native rwlocks are available
+AC_CHECK_FUNCS(pthread_rwlock_init)
+LIBS=$saved_LIBS
+
 AC_CHECK_FUNCS(prctl)
 
 AC_CHECK_HEADERS(sys/sockio.h)
@@ -903,6 +334,32 @@ AC_CHECK_MEMBERS([struct sadb_x_policy.sadb_x_policy_priority], [], [],
 	#endif
 ])
 
+AC_MSG_CHECKING([for in6addr_any])
+AC_TRY_COMPILE(
+	[#include <sys/types.h>
+	#include <sys/socket.h>
+	#include <netinet/in.h>],
+	[struct in6_addr in6;
+	in6 = in6addr_any;],
+	[AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_IN6ADDR_ANY])],
+	[AC_MSG_RESULT([no])]
+)
+
+AC_MSG_CHECKING([for in6_pktinfo])
+AC_TRY_COMPILE(
+	[#define _GNU_SOURCE
+	#include <sys/types.h>
+	#include <sys/socket.h>
+	#include <netinet/in.h>],
+	[struct in6_pktinfo pi;
+	if (pi.ipi6_ifindex)
+	{
+		return 0;
+	}],
+	[AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_IN6_PKTINFO])],
+	[AC_MSG_RESULT([no])]
+)
+
 AC_MSG_CHECKING([for IPSEC_MODE_BEET])
 AC_TRY_COMPILE(
 	[#include <sys/types.h>
@@ -953,13 +410,19 @@ AC_TRY_RUN(
 [AC_MSG_RESULT([no])],
 [AC_MSG_RESULT([no])])
 
+dnl check for the new register_printf_specifier function with len argument,
+dnl or the deprecated register_printf_function without
 AC_CHECK_FUNC(
-	[register_printf_function],
-	[AC_DEFINE(HAVE_PRINTF_HOOKS)],
-	[
-		AC_MSG_NOTICE([printf does not support custom format specifiers!])
-		vstr=true
-	]
+	[register_printf_specifier],
+	[AC_DEFINE(HAVE_PRINTF_SPECIFIER)],
+	[AC_CHECK_FUNC(
+		[register_printf_function],
+		[AC_DEFINE(HAVE_PRINTF_FUNCTION)],
+		[
+			AC_MSG_NOTICE([printf does not support custom format specifiers!])
+			vstr=true
+		]
+	)]
 )
 
 if test x$vstr = xtrue; then
@@ -976,7 +439,7 @@ if test x$gmp = xtrue; then
 			#if (__GNU_MP_VERSION*100 +  __GNU_MP_VERSION_MINOR*10 + __GNU_MP_VERSION_PATCHLEVEL) < 414
 				#error bad gmp
 			#endif
-		], 
+		],
 		[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); AC_MSG_ERROR([No usable gmp.h found!])]
 	)
 fi
@@ -1034,14 +497,18 @@ if test x$fast = xtrue; then
 	AC_HAVE_LIBRARY([z],[LIBS="$LIBS"],[AC_MSG_ERROR([ClearSilver dependency zlib not found!])])
 dnl autoconf does not like CamelCase!? How to fix this?
 dnl	AC_CHECK_HEADER([ClearSilver/ClearSilver.h],,[AC_MSG_ERROR([ClearSilver header file ClearSilver/ClearSilver.h not found!])])
-	
+
 	AC_HAVE_LIBRARY([fcgi],[LIBS="$LIBS"],[AC_MSG_ERROR([FastCGI library fcgi not found!])])
 	AC_CHECK_HEADER([fcgiapp.h],,[AC_MSG_ERROR([FastCGI header file fcgiapp.h not found!])])
 fi
 
 if test x$mysql = xtrue; then
-	AC_HAVE_LIBRARY([mysqlclient_r],[LIBS="$LIBS"],[AC_MSG_ERROR([MySQL library mysqlclient_r not found])])
-	AC_CHECK_HEADER([mysql/mysql.h],,[AC_MSG_ERROR([MySQL header mysql/mysql.h not found!])])
+	AC_PATH_PROG([MYSQLCONFIG], [mysql_config], [], [$PATH:/bin:/usr/bin:/usr/local/bin])
+	if test x$MYSQLCONFIG = x; then
+		AC_MSG_ERROR([mysql_config not found!])
+	fi
+	AC_SUBST(MYSQLLIB, `$MYSQLCONFIG --libs_r`)
+	AC_SUBST(MYSQLCFLAG, `$MYSQLCONFIG --cflags`)
 fi
 
 if test x$sqlite = xtrue; then
@@ -1052,7 +519,7 @@ if test x$sqlite = xtrue; then
 		[#include <sqlite3.h>],
 		[
 			void *test = sqlite3_prepare_v2;
-		], 
+		],
 		[AC_MSG_RESULT([yes])]; AC_DEFINE_UNQUOTED(HAVE_SQLITE3_PREPARE_V2, 1), [AC_MSG_RESULT([no])])
 	AC_MSG_CHECKING([sqlite3.h version >= 3.3.1])
 	AC_TRY_COMPILE(
@@ -1061,7 +528,7 @@ if test x$sqlite = xtrue; then
 			#if SQLITE_VERSION_NUMBER < 3003001
 				#error bad sqlite
 			#endif
-		], 
+		],
 		[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); AC_MSG_ERROR([SQLite version >= 3.3.1 required!])])
 fi
 
@@ -1071,7 +538,8 @@ if test x$openssl = xtrue; then
 fi
 
 if test x$gcrypt = xtrue; then
-	AM_PATH_LIBGCRYPT(,,[AC_MSG_ERROR([libgcrypt not found!])])
+	AC_HAVE_LIBRARY([gcrypt],[LIBS="$LIBS"],[AC_MSG_ERROR([gcrypt library not found])])
+	AC_CHECK_HEADER([gcrypt.h],,[AC_MSG_ERROR([gcrypt header gcrypt.h not found!])])
 	AC_MSG_CHECKING([gcrypt CAMELLIA cipher])
 	AC_TRY_COMPILE(
 		[#include <gcrypt.h>],
@@ -1087,7 +555,10 @@ if test x$uci = xtrue; then
 fi
 
 if test x$nm = xtrue; then
-	PKG_CHECK_MODULES(nm, [NetworkManager libnm_glib_vpn gthread-2.0])
+	PKG_CHECK_EXISTS([libnm-glib],
+		[PKG_CHECK_MODULES(nm, [NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn])],
+		[PKG_CHECK_MODULES(nm, [NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn])]
+	)
 	AC_SUBST(nm_CFLAGS)
 	AC_SUBST(nm_LIBS)
 fi
@@ -1107,7 +578,7 @@ if test x$integrity_test = xtrue; then
 	AC_TRY_COMPILE(
 		[#define _GNU_SOURCE
 		 #include <dlfcn.h>],
-		[Dl_info info; dladdr(main, &info);], 
+		[Dl_info info; dladdr(main, &info);],
 		[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]);
 		 AC_MSG_ERROR([dladdr() not supported, required by integrity-test!])]
 	)
@@ -1115,7 +586,7 @@ if test x$integrity_test = xtrue; then
 	AC_TRY_COMPILE(
 		[#define _GNU_SOURCE
 		 #include <link.h>],
-		[dl_iterate_phdr((void*)0, (void*)0);], 
+		[dl_iterate_phdr((void*)0, (void*)0);],
 		[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]);
 		 AC_MSG_ERROR([dl_iterate_phdr() not supported, required by integrity-test!])]
 	)
@@ -1176,16 +647,39 @@ if test x$random = xtrue; then
 fi
 if test x$x509 = xtrue; then
 	libstrongswan_plugins=${libstrongswan_plugins}" x509"
+	pluto_plugins=${pluto_plugins}" x509"
 fi
 if test x$pubkey = xtrue; then
 	libstrongswan_plugins=${libstrongswan_plugins}" pubkey"
 	pluto_plugins=${pluto_plugins}" pubkey"
 fi
+if test x$pkcs1 = xtrue; then
+	libstrongswan_plugins=${libstrongswan_plugins}" pkcs1"
+	pluto_plugins=${pluto_plugins}" pkcs1"
+fi
+if test x$pgp = xtrue; then
+	libstrongswan_plugins=${libstrongswan_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
+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
+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"
@@ -1237,10 +731,15 @@ AM_CONDITIONAL(USE_GMP, test x$gmp = xtrue)
 AM_CONDITIONAL(USE_RANDOM, test x$random = xtrue)
 AM_CONDITIONAL(USE_X509, test x$x509 = xtrue)
 AM_CONDITIONAL(USE_PUBKEY, test x$pubkey = xtrue)
+AM_CONDITIONAL(USE_PKCS1, test x$pkcs1 = xtrue)
+AM_CONDITIONAL(USE_PGP, test x$pgp = xtrue)
+AM_CONDITIONAL(USE_DNSKEY, test x$dnskey = xtrue)
+AM_CONDITIONAL(USE_PEM, test x$pem = xtrue)
 AM_CONDITIONAL(USE_HMAC, test x$hmac = xtrue)
 AM_CONDITIONAL(USE_XCBC, test x$xcbc = xtrue)
 AM_CONDITIONAL(USE_MYSQL, test x$mysql = xtrue)
 AM_CONDITIONAL(USE_SQLITE, test x$sqlite = xtrue)
+AM_CONDITIONAL(USE_ATTR_SQL, test x$attr_sql = xtrue -o x$sql = xtrue)
 AM_CONDITIONAL(USE_PADLOCK, test x$padlock = xtrue)
 AM_CONDITIONAL(USE_OPENSSL, test x$openssl = xtrue)
 AM_CONDITIONAL(USE_GCRYPT, test x$gcrypt = xtrue)
@@ -1257,15 +756,18 @@ AM_CONDITIONAL(USE_SMP, test x$smp = xtrue)
 AM_CONDITIONAL(USE_SQL, test x$sql = xtrue)
 AM_CONDITIONAL(USE_UPDOWN, test x$updown = xtrue)
 AM_CONDITIONAL(USE_ATTR, test x$attr = xtrue)
-AM_CONDITIONAL(USE_RESOLV_CONF, test x$resolvconf = xtrue)
-AM_CONDITIONAL(USE_UNIT_TESTS, test x$unittest = xtrue)
-AM_CONDITIONAL(USE_LOAD_TESTS, test x$loadtest = xtrue)
+AM_CONDITIONAL(USE_RESOLVE, test x$resolve = xtrue)
+AM_CONDITIONAL(USE_UNIT_TESTS, test x$unit_tests = xtrue)
+AM_CONDITIONAL(USE_LOAD_TESTER, test x$load_tester = xtrue)
 AM_CONDITIONAL(USE_EAP_SIM, test x$eap_sim = xtrue)
 AM_CONDITIONAL(USE_EAP_SIM_FILE, test x$eap_sim_file = xtrue)
+AM_CONDITIONAL(USE_EAP_SIMAKA_PSEUDONYM, test x$eap_simaka_pseudonym = xtrue)
+AM_CONDITIONAL(USE_EAP_SIMAKA_REAUTH, test x$eap_simaka_reauth = xtrue)
 AM_CONDITIONAL(USE_EAP_IDENTITY, test x$eap_identity = xtrue)
 AM_CONDITIONAL(USE_EAP_MD5, test x$eap_md5 = xtrue)
 AM_CONDITIONAL(USE_EAP_GTC, test x$eap_gtc = xtrue)
 AM_CONDITIONAL(USE_EAP_AKA, test x$eap_aka = xtrue)
+AM_CONDITIONAL(USE_EAP_AKA_3GPP2, test x$eap_aka_3gpp2 = xtrue)
 AM_CONDITIONAL(USE_EAP_MSCHAPV2, test x$eap_mschapv2 = xtrue)
 AM_CONDITIONAL(USE_EAP_RADIUS, test x$eap_radius = xtrue)
 AM_CONDITIONAL(USE_KERNEL_NETLINK, test x$kernel_netlink = xtrue)
@@ -1285,7 +787,7 @@ AM_CONDITIONAL(USE_XAUTH_VID, test x$xauth_vid = xtrue)
 AM_CONDITIONAL(USE_DUMM, test x$dumm = xtrue)
 AM_CONDITIONAL(USE_FAST, test x$fast = xtrue)
 AM_CONDITIONAL(USE_MANAGER, test x$manager = xtrue)
-AM_CONDITIONAL(USE_ME, test x$me = xtrue)
+AM_CONDITIONAL(USE_ME, test x$mediation = xtrue)
 AM_CONDITIONAL(USE_INTEGRITY_TEST, test x$integrity_test = xtrue)
 AM_CONDITIONAL(USE_CAPABILITIES, test x$capabilities = xlibcap)
 AM_CONDITIONAL(USE_PLUTO, test x$pluto = xtrue)
@@ -1296,12 +798,13 @@ AM_CONDITIONAL(USE_SCRIPTS, test x$scripts = xtrue)
 AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$pluto = xtrue -o x$tools = xtrue)
 AM_CONDITIONAL(USE_FILE_CONFIG, test x$pluto = xtrue -o x$stroke = xtrue)
 AM_CONDITIONAL(USE_VSTR, test x$vstr = xtrue)
+AM_CONDITIONAL(USE_SIMAKA, test x$simaka = xtrue)
 
 dnl ==============================
 dnl  set global definitions
 dnl ==============================
 
-if test x$me = xtrue; then
+if test x$mediation = xtrue; then
 	AC_DEFINE(ME)
 fi
 if test x$capabilities = xlibcap; then
@@ -1331,25 +834,34 @@ AC_OUTPUT(
 	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
@@ -1365,7 +877,7 @@ AC_OUTPUT(
 	src/charon/plugins/stroke/Makefile
 	src/charon/plugins/updown/Makefile
 	src/charon/plugins/attr/Makefile
-	src/charon/plugins/resolv_conf/Makefile
+	src/charon/plugins/resolve/Makefile
 	src/charon/plugins/unit_tester/Makefile
 	src/charon/plugins/load_tester/Makefile
 	src/stroke/Makefile
@@ -1376,6 +888,7 @@ AC_OUTPUT(
 	src/_copyright/Makefile
 	src/openac/Makefile
 	src/scepclient/Makefile
+	src/pki/Makefile
 	src/dumm/Makefile
 	src/dumm/ext/extconf.rb
 	src/libfast/Makefile