list assigned leases using "ipsec leases"
[strongswan.git] / configure.in
index d9473fd..ea9b6dd 100644 (file)
@@ -16,7 +16,7 @@ dnl ===========================
 dnl  initialize & set some vars
 dnl ===========================
 
-AC_INIT(strongSwan,4.2.2)
+AC_INIT(strongSwan,4.2.10)
 AM_INIT_AUTOMAKE(tar-ustar)
 AC_C_BIGENDIAN
 AC_SUBST(confdir, '${sysconfdir}')
@@ -26,7 +26,6 @@ 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"]),
@@ -49,15 +48,15 @@ AC_ARG_WITH(
 AC_ARG_WITH(
        [resolv-conf],
        AS_HELP_STRING([--with-resolv-conf=file],[set the file to store DNS server information other than "sysconfdir/resolv.conf"]),
-       [AC_DEFINE_UNQUOTED(RESOLV_CONF, "$withval")],
-       [AC_DEFINE_UNQUOTED(RESOLV_CONF, "${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_DEFINE_UNQUOTED(STRONGSWAN_CONF, "$withval")],
-       [AC_DEFINE_UNQUOTED(STRONGSWAN_CONF, "${sysconfdir}/strongswan.conf")]
+       [AC_SUBST(strongswan_conf, "$withval")],
+       [AC_SUBST(strongswan_conf, "${sysconfdir}/strongswan.conf")]
 )
 
 AC_ARG_WITH(
@@ -78,28 +77,28 @@ 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(ipsecdir, "${libexecdir%/}/ipsec")]
 )
-AC_SUBST(plugindir, "${ipsecdir}/plugins")
+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_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_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, "../include")]
+       [AC_SUBST(linuxdir, "$withval")], [AC_SUBST(linuxdir, "\${top_srcdir}/src/include")]
 )
 AC_SUBST(LINUX_HEADERS)
 
@@ -118,17 +117,33 @@ AC_ARG_WITH(
 )
 
 AC_ARG_WITH(
-       [uid],
-       AS_HELP_STRING([--with-uid=uid],[change user of the daemons to UID after startup (default is 0).]),
-       [AC_DEFINE_UNQUOTED(IPSEC_UID, $withval) AC_SUBST(ipsecuid, "$withval")],
-       [AC_DEFINE_UNQUOTED(IPSEC_UID, 0) AC_SUBST(ipsecuid, "0")]
+       [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 0).]),
+       [AC_DEFINE_UNQUOTED(IPSEC_USER, "$withval") AC_SUBST(ipsecuser, "$withval")],
+       [AC_SUBST(ipsecuser, "root")]
+)
+
+AC_ARG_WITH(
+       [group],
+       AS_HELP_STRING([--with-group=group],[change group of the daemons to "group" after startup (default is 0).]),
+       [AC_DEFINE_UNQUOTED(IPSEC_GROUP, "$withval") AC_SUBST(ipsecgroup, "$withval")],
+       [AC_SUBST(ipsecgroup, "root")]
 )
 
+dnl Will be extended to --with-capabilities=libcap|libcap2
 AC_ARG_WITH(
-       [gid],
-       AS_HELP_STRING([--with-gid=gid],[change group of the daemons to GID after startup (default is 0).]),
-       [AC_DEFINE_UNQUOTED(IPSEC_GID, $withval) AC_SUBST(ipsecgid, "$withval")],
-       [AC_DEFINE_UNQUOTED(IPSEC_GID, 0) AC_SUBST(ipsecgid, "0")]
+       [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(
@@ -247,6 +262,17 @@ AC_ARG_ENABLE(
 )
 
 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
@@ -296,10 +322,18 @@ AC_ARG_ENABLE(
 )
 
 AC_ARG_ENABLE(
-       [med-db],
-       AS_HELP_STRING([--enable-med-db],[enable MySQL mediation database plugin (default is NO).]),
+       [medsrv],
+       AS_HELP_STRING([--enable-medsrv],[enable mediation server web frontend and daemon plugin (default is NO).]),
        [if test x$enableval = xyes; then
-               med_db=true
+               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]
 )
 
@@ -344,6 +378,14 @@ AC_ARG_ENABLE(
 )
 
 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
@@ -352,6 +394,14 @@ AC_ARG_ENABLE(
 )
 
 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
@@ -360,6 +410,14 @@ AC_ARG_ENABLE(
 )
 
 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
@@ -376,6 +434,14 @@ AC_ARG_ENABLE(
 )
 
 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
@@ -384,6 +450,33 @@ AC_ARG_ENABLE(
 )
 
 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-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
@@ -477,6 +570,17 @@ AC_ARG_ENABLE(
 )
 
 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
@@ -499,6 +603,17 @@ AC_ARG_ENABLE(
 )
 
 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(
        [padlock],
        AS_HELP_STRING([--enable-padlock],[enables VIA Padlock crypto plugin. (default is NO).]),
        [if test x$enableval = xyes; then
@@ -518,6 +633,32 @@ AC_ARG_ENABLE(
        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]
+)
+
 dnl =========================
 dnl  check required programs
 dnl =========================
@@ -550,6 +691,15 @@ if test x$manager = xtrue; then
        fast=true
 fi
 
+if test x$medsrv = xtrue; then
+       me=true
+       fast=true
+fi
+
+if test x$medcli = xtrue; then
+       me=true
+fi
+
 dnl ==========================================
 dnl  check required libraries and header files
 dnl ==========================================
@@ -558,14 +708,20 @@ AC_HAVE_LIBRARY(dl)
 AC_CHECK_FUNCS(backtrace)
 AC_CHECK_FUNCS(dladdr)
 
-AC_MSG_CHECKING([capset() definition])
-AC_TRY_COMPILE(
-       [#include <linux/capset.h>],
-       [
-               void *test = capset;
-       ], 
-       [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); AC_DEFINE_UNQUOTED(NO_CAPSET_DEFINED, 1)]
-)
+AC_MSG_CHECKING([for gcc atomic operations])
+AC_TRY_RUN(
+[
+       int main() {
+               volatile int ref = 1;
+               __sync_fetch_and_add (&ref, 1);
+               __sync_sub_and_fetch (&ref, 1);
+               /* Make sure test fails if operations are not supported */
+               __sync_val_compare_and_swap(&ref, 1, 0);
+               return ref;
+       }
+],
+[AC_MSG_RESULT([yes]); AC_DEFINE(HAVE_GCC_ATOMIC_OPERATIONS)],
+[AC_MSG_RESULT([no])])
 
 if test x$gmp = xtrue; then
        AC_HAVE_LIBRARY([gmp],[LIBS="$LIBS"],[AC_MSG_ERROR([GNU Multi Precision library gmp not found])])
@@ -630,17 +786,115 @@ if test x$sqlite = xtrue; then
                        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(
+               [#include <sqlite3.h>],
+               [
+                       #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
 
 if test x$openssl = xtrue; then
-       AC_HAVE_LIBRARY([ssl],[LIBS="$LIBS"],[AC_MSG_ERROR([OpenSSL library ssl not found])])
+       AC_HAVE_LIBRARY([crypto],[LIBS="$LIBS"],[AC_MSG_ERROR([OpenSSL crypto library not found])])
        AC_CHECK_HEADER([openssl/evp.h],,[AC_MSG_ERROR([OpenSSL header openssl/evp.h not found!])])
 fi
 
+if test x$uci = xtrue; then
+       AC_HAVE_LIBRARY([uci],[LIBS="$LIBS"],[AC_MSG_ERROR([UCI library libuci not found])])
+       AC_CHECK_HEADER([uci.h],,[AC_MSG_ERROR([UCI header uci.h not found!])])
+fi
+
+if test x$nm = xtrue; then
+       PKG_CHECK_MODULES(nm, [NetworkManager libnm_glib_vpn gthread-2.0])
+       AC_SUBST(nm_CFLAGS)
+       AC_SUBST(nm_LIBS)
+fi
+
+if test x$eap_gtc = xtrue; then
+       AC_HAVE_LIBRARY([pam],[LIBS="$LIBS"],[AC_MSG_ERROR([PAM library not found])])
+       AC_CHECK_HEADER([security/pam_appl.h],,[AC_MSG_ERROR([PAM header security/pam_appl.h not found!])])
+fi
+
+if test x$capabilities = xlibcap; then
+       AC_HAVE_LIBRARY([cap],[LIBS="$LIBS"],[AC_MSG_ERROR([libcap library not found])])
+       AC_CHECK_HEADER([sys/capability.h],,[AC_MSG_ERROR([libcap header sys/capability.h not found!])])
+fi
+
+dnl ======================================
+dnl  collect all plugins for libstrongswan
+dnl ======================================
+
+libstrongswan_plugins=
+
+if test x$curl = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" curl"
+fi
+if test x$ldap = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" ldap"
+fi
+if test x$aes = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" aes"
+fi
+if test x$des = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" des"
+fi
+if test x$sha1 = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" sha1"
+fi
+if test x$sha2 = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" sha2"
+fi
+if test x$md5 = xtrue; then
+       libstrongswan_plugins=${libstrongswan_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"
+fi
+if test x$x509 = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" x509"
+fi
+if test x$pubkey = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" pubkey"
+fi
+if test x$xcbc = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" xcbc"
+fi
+if test x$hmac = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" hmac"
+fi
+if test x$mysql = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" mysql"
+fi
+if test x$sqlite = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" sqlite"
+fi
+if test x$padlock = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" padlock"
+fi
+if test x$openssl = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" openssl"
+fi
+if test x$agent = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" agent"
+fi
+if test x$gmp = xtrue; then
+       libstrongswan_plugins=${libstrongswan_plugins}" gmp"
+fi
+
+AC_SUBST(libstrongswan_plugins)
+
 dnl =========================
 dnl  set Makefile.am vars
 dnl =========================
 
+dnl libstrongswan plugins
+dnl =====================
 AM_CONDITIONAL(USE_CURL, test x$curl = xtrue)
 AM_CONDITIONAL(USE_LDAP, test x$ldap = xtrue)
 AM_CONDITIONAL(USE_AES, test x$aes = xtrue)
@@ -652,22 +906,43 @@ AM_CONDITIONAL(USE_FIPS_PRF, test x$fips_prf = xtrue)
 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_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_PADLOCK, test x$padlock = xtrue)
+AM_CONDITIONAL(USE_OPENSSL, test x$openssl = xtrue)
+AM_CONDITIONAL(USE_AGENT, test x$agent = xtrue)
+
+dnl charon plugins
+dnl ==============
 AM_CONDITIONAL(USE_STROKE, test x$stroke = xtrue)
-AM_CONDITIONAL(USE_MED_DB, test x$med_db = xtrue)
+AM_CONDITIONAL(USE_MEDSRV, test x$medsrv = xtrue)
+AM_CONDITIONAL(USE_MEDCLI, test x$medcli = xtrue)
+AM_CONDITIONAL(USE_NM, test x$nm = xtrue)
+AM_CONDITIONAL(USE_UCI, test x$uci = xtrue)
 AM_CONDITIONAL(USE_SMP, test x$smp = xtrue)
 AM_CONDITIONAL(USE_SQL, test x$sql = xtrue)
-AM_CONDITIONAL(USE_SMARTCARD, test x$smartcard = xtrue)
-AM_CONDITIONAL(USE_CISCO_QUIRKS, test x$cisco_quirks = xtrue)
-AM_CONDITIONAL(USE_LEAK_DETECTIVE, test x$leak_detective = xtrue)
+AM_CONDITIONAL(USE_UPDOWN, test x$updown = xtrue)
 AM_CONDITIONAL(USE_UNIT_TESTS, test x$unittest = xtrue)
+AM_CONDITIONAL(USE_LOAD_TESTS, test x$loadtest = 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_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_KERNEL_NETLINK, test x$kernel_netlink = xtrue)
+AM_CONDITIONAL(USE_KERNEL_PFKEY, test x$kernel_pfkey = xtrue)
+AM_CONDITIONAL(USE_KERNEL_KLIPS, test x$kernel_klips = xtrue)
+
+dnl other options
+dnl =============
+AM_CONDITIONAL(USE_SMARTCARD, test x$smartcard = xtrue)
+AM_CONDITIONAL(USE_CISCO_QUIRKS, test x$cisco_quirks = xtrue)
+AM_CONDITIONAL(USE_LEAK_DETECTIVE, test x$leak_detective = xtrue)
+AM_CONDITIONAL(USE_LOCK_PROFILER, test x$lock_profiler = xtrue)
 AM_CONDITIONAL(USE_NAT_TRANSPORT, test x$nat_transport = xtrue)
 AM_CONDITIONAL(USE_VENDORID, test x$vendor_id = xtrue)
 AM_CONDITIONAL(USE_XAUTH_VID, test x$xauth_vid = xtrue)
@@ -677,14 +952,13 @@ AM_CONDITIONAL(USE_MANAGER, test x$manager = xtrue)
 AM_CONDITIONAL(USE_ME, test x$me = xtrue)
 AM_CONDITIONAL(USE_INTEGRITY_TEST, test x$integrity_test = xtrue)
 AM_CONDITIONAL(USE_SELF_TEST, test x$self_test = xtrue)
+AM_CONDITIONAL(USE_CAPABILITIES, test x$capabilities = xlibcap)
 AM_CONDITIONAL(USE_PLUTO, test x$pluto = xtrue)
+AM_CONDITIONAL(USE_THREADS, test x$threads = xtrue)
 AM_CONDITIONAL(USE_CHARON, test x$charon = xtrue)
 AM_CONDITIONAL(USE_TOOLS, test x$tools = xtrue)
-AM_CONDITIONAL(USE_PLUTO_OR_CHARON, test x$pluto = xtrue -o x$charon = xtrue)
 AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$tools = xtrue)
 AM_CONDITIONAL(USE_FILE_CONFIG, test x$pluto = xtrue -o x$stroke = xtrue)
-AM_CONDITIONAL(USE_PADLOCK, test x$padlock = xtrue)
-AM_CONDITIONAL(USE_OPENSSL, test x$openssl = xtrue)
 
 dnl ==============================
 dnl  set global definitions
@@ -693,6 +967,9 @@ dnl ==============================
 if test x$me = xtrue; then
        AC_DEFINE(ME)
 fi
+if test x$capabilities = xlibcap; then
+       AC_DEFINE(CAPABILITIES)
+fi
 
 dnl ==============================
 dnl  build Makefiles
@@ -714,12 +991,15 @@ AC_OUTPUT(
        src/libstrongswan/plugins/hmac/Makefile
        src/libstrongswan/plugins/xcbc/Makefile
        src/libstrongswan/plugins/x509/Makefile
+       src/libstrongswan/plugins/pubkey/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/agent/Makefile
+       src/libstrongswan/fips/Makefile
        src/libcrypto/Makefile
        src/libfreeswan/Makefile
        src/pluto/Makefile
@@ -728,12 +1008,22 @@ AC_OUTPUT(
        src/charon/plugins/eap_aka/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/kernel_netlink/Makefile
+       src/charon/plugins/kernel_pfkey/Makefile
+       src/charon/plugins/kernel_klips/Makefile
        src/charon/plugins/smp/Makefile
        src/charon/plugins/sql/Makefile
-       src/charon/plugins/med_db/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/unit_tester/Makefile
+       src/charon/plugins/load_tester/Makefile
        src/stroke/Makefile
        src/ipsec/Makefile
        src/starter/Makefile
@@ -745,5 +1035,7 @@ AC_OUTPUT(
        src/dumm/Makefile
        src/libfast/Makefile
        src/manager/Makefile
+       src/medsrv/Makefile
+       scripts/Makefile
        testing/Makefile
 )