Import upstream version 5.1.3

1 files changed, 1340 insertions, 1156 deletions

diff --git a/configure b/configure
index 652a5d06f..6c4e4c925 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.69 for strongSwan 5.1.2.
+# Generated by GNU Autoconf 2.69 for strongSwan 5.1.3.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='strongSwan'
 PACKAGE_TARNAME='strongswan'
-PACKAGE_VERSION='5.1.2'
-PACKAGE_STRING='strongSwan 5.1.2'
+PACKAGE_VERSION='5.1.3'
+PACKAGE_STRING='strongSwan 5.1.3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -921,6 +921,8 @@ USE_PKCS1_FALSE
 USE_PKCS1_TRUE
 USE_PUBKEY_FALSE
 USE_PUBKEY_TRUE
+USE_ACERT_FALSE
+USE_ACERT_TRUE
 USE_CONSTRAINTS_FALSE
 USE_CONSTRAINTS_TRUE
 USE_REVOCATION_FALSE
@@ -974,7 +976,6 @@ manager_plugins
 scripts_plugins
 pki_plugins
 scepclient_plugins
-openac_plugins
 attest_plugins
 pool_plugins
 starter_plugins
@@ -1196,58 +1197,58 @@ with_tss
 with_capabilities
 with_mpz_powm_sec
 with_dev_headers
+with_printf_hooks
 with_systemdsystemunitdir
 with_user
 with_group
 with_charon_udp_port
 with_charon_natt_port
-enable_curl
-enable_unbound
-enable_soup
-enable_ldap
 enable_aes
-enable_des
+enable_af_alg
 enable_blowfish
-enable_rc2
+enable_ccm
+enable_cmac
+enable_ctr
+enable_des
+enable_fips_prf
+enable_gcm
+enable_gcrypt
+enable_gmp
+enable_hmac
 enable_md4
 enable_md5
+enable_nonce
+enable_ntru
+enable_openssl
+enable_padlock
+enable_random
+enable_rc2
+enable_rdrand
 enable_sha1
 enable_sha2
-enable_fips_prf
-enable_gmp
-enable_rdrand
-enable_random
-enable_nonce
-enable_x509
-enable_revocation
-enable_constraints
-enable_pubkey
+enable_xcbc
+enable_dnskey
+enable_pem
+enable_pgp
 enable_pkcs1
 enable_pkcs7
 enable_pkcs8
 enable_pkcs12
-enable_pgp
-enable_dnskey
+enable_pubkey
 enable_sshkey
-enable_dnscert
-enable_ipseckey
-enable_pem
-enable_hmac
-enable_cmac
-enable_xcbc
-enable_af_alg
-enable_test_vectors
+enable_x509
+enable_curl
+enable_ldap
+enable_soup
+enable_unbound
 enable_mysql
 enable_sqlite
-enable_stroke
-enable_medsrv
-enable_medcli
-enable_smp
-enable_sql
-enable_leak_detective
-enable_lock_profiler
-enable_unit_tester
-enable_load_tester
+enable_addrblock
+enable_acert
+enable_agent
+enable_constraints
+enable_coupling
+enable_dnscert
 enable_eap_sim
 enable_eap_sim_file
 enable_eap_sim_pcsc
@@ -1266,89 +1267,91 @@ enable_eap_peap
 enable_eap_tnc
 enable_eap_dynamic
 enable_eap_radius
+enable_ipseckey
+enable_keychain
+enable_pkcs11
+enable_revocation
+enable_whitelist
 enable_xauth_generic
 enable_xauth_eap
 enable_xauth_pam
 enable_xauth_noauth
-enable_tnc_ifmap
-enable_tnc_pdp
-enable_tnc_imc
-enable_tnc_imv
-enable_tnccs_11
-enable_tnccs_20
-enable_tnccs_dynamic
-enable_imc_test
-enable_imv_test
-enable_imc_scanner
-enable_imv_scanner
-enable_imc_os
-enable_imv_os
-enable_imc_attestation
-enable_imv_attestation
-enable_imc_swid
-enable_imv_swid
 enable_kernel_netlink
 enable_kernel_pfkey
 enable_kernel_pfroute
 enable_kernel_klips
 enable_kernel_libipsec
-enable_libipsec
 enable_socket_default
 enable_socket_dynamic
-enable_farp
-enable_dumm
-enable_fast
-enable_manager
-enable_mediation
-enable_integrity_test
-enable_load_warning
-enable_ikev1
-enable_ikev2
-enable_charon
-enable_tools
-enable_scripts
-enable_conftest
-enable_updown
+enable_stroke
+enable_smp
+enable_sql
+enable_uci
+enable_android_dns
 enable_attr
 enable_attr_sql
 enable_dhcp
+enable_osx_attr
 enable_resolve
-enable_padlock
-enable_openssl
-enable_gcrypt
-enable_agent
-enable_keychain
-enable_pkcs11
-enable_ctr
-enable_ccm
-enable_gcm
-enable_ntru
-enable_addrblock
 enable_unity
-enable_uci
-enable_osx_attr
-enable_android_dns
+enable_imc_test
+enable_imv_test
+enable_imc_scanner
+enable_imv_scanner
+enable_imc_os
+enable_imv_os
+enable_imc_attestation
+enable_imv_attestation
+enable_imc_swid
+enable_imv_swid
+enable_tnc_ifmap
+enable_tnc_imc
+enable_tnc_imv
+enable_tnc_pdp
+enable_tnccs_11
+enable_tnccs_20
+enable_tnccs_dynamic
 enable_android_log
-enable_maemo
-enable_nm
-enable_ha
-enable_whitelist
-enable_lookip
-enable_error_notify
 enable_certexpire
-enable_systime_fix
-enable_led
 enable_duplicheck
-enable_coupling
+enable_error_notify
+enable_farp
+enable_ha
+enable_led
+enable_load_tester
+enable_lookip
+enable_maemo
 enable_radattr
-enable_vstr
-enable_monolithic
+enable_systime_fix
+enable_test_vectors
+enable_unit_tester
+enable_updown
+enable_charon
+enable_cmd
+enable_conftest
+enable_dumm
+enable_fast
+enable_libipsec
+enable_manager
+enable_medcli
+enable_medsrv
+enable_nm
+enable_scripts
+enable_tkm
+enable_tools
 enable_bfd_backtraces
+enable_ikev1
+enable_ikev2
+enable_integrity_test
+enable_load_warning
+enable_mediation
 enable_unwind_backtraces
 enable_coverage
-enable_tkm
-enable_cmd
+enable_leak_detective
+enable_lock_profiler
+enable_monolithic
 enable_defaults
+enable_all
 enable_dependency_tracking
 with_lib_prefix
 enable_shared
@@ -1926,7 +1929,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 5.1.2 to adapt to many kinds of systems.
+\`configure' configures strongSwan 5.1.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1996,7 +1999,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of strongSwan 5.1.2:";;
+     short | recursive ) echo "Configuration of strongSwan 5.1.3:";;
    esac
   cat <<\_ACEOF
 
@@ -2006,64 +2009,61 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
-  --enable-curl           enable CURL fetcher plugin to fetch files via
-                          libcurl. Requires libcurl.
-  --enable-unbound        enable UNBOUND resolver plugin to perform DNS
-                          queries via libunbound. Requires libldns and
-                          libunbound.
-  --enable-soup           enable soup fetcher plugin to fetch from HTTP via
-                          libsoup. Requires libsoup.
-  --enable-ldap           enable LDAP fetching plugin to fetch files via
-                          libldap. Requires openLDAP.
   --disable-aes           disable AES software implementation plugin.
-  --disable-des           disable DES/3DES software implementation plugin.
+  --enable-af-alg         enable AF_ALG crypto interface to Linux Crypto API.
   --enable-blowfish       enable Blowfish software implementation plugin.
-  --disable-rc2           disable RC2 software implementation plugin.
+  --enable-ccm            enables the CCM AEAD wrapper crypto plugin.
+  --disable-cmac          disable CMAC crypto implementation plugin.
+  --enable-ctr            enables the Counter Mode wrapper crypto plugin.
+  --disable-des           disable DES/3DES software implementation plugin.
+  --disable-fips-prf      disable FIPS PRF software implementation plugin.
+  --enable-gcm            enables the GCM AEAD wrapper crypto plugin.
+  --enable-gcrypt         enables the libgcrypt plugin.
+  --disable-gmp           disable GNU MP (libgmp) based crypto implementation
+                          plugin.
+  --disable-hmac          disable HMAC crypto implementation plugin.
   --enable-md4            enable MD4 software implementation plugin.
   --disable-md5           disable MD5 software implementation plugin.
+  --disable-nonce         disable nonce generation plugin.
+  --enable-ntru           enables the NTRU crypto plugin.
+  --enable-openssl        enables the OpenSSL crypto plugin.
+  --enable-padlock        enables VIA Padlock crypto plugin.
+  --disable-random        disable RNG implementation on top of /dev/(u)random.
+  --disable-rc2           disable RC2 software implementation plugin.
+  --enable-rdrand         enable Intel RDRAND random generator plugin.
   --disable-sha1          disable SHA1 software implementation plugin.
   --disable-sha2          disable SHA256/SHA384/SHA512 software implementation
                           plugin.
-  --disable-fips-prf      disable FIPS PRF software implementation plugin.
-  --disable-gmp           disable GNU MP (libgmp) based crypto implementation
-                          plugin.
-  --enable-rdrand         enable Intel RDRAND random generator plugin.
-  --disable-random        disable RNG implementation on top of /dev/(u)random.
-  --disable-nonce         disable nonce generation plugin.
-  --disable-x509          disable X509 certificate implementation plugin.
-  --disable-revocation    disable X509 CRL/OCSP revocation check plugin.
-  --disable-constraints   disable advanced X509 constraint checking plugin.
-  --disable-pubkey        disable RAW public key support plugin.
+  --disable-xcbc          disable xcbc crypto implementation plugin.
+  --disable-dnskey        disable DNS RR key decoding plugin.
+  --disable-pem           disable PEM decoding plugin.
+  --disable-pgp           disable PGP key decoding plugin.
   --disable-pkcs1         disable PKCS1 key decoding plugin.
   --disable-pkcs7         disable PKCS7 container support plugin.
   --disable-pkcs8         disable PKCS8 private key decoding plugin.
   --disable-pkcs12        disable PKCS12 container support plugin.
-  --disable-pgp           disable PGP key decoding plugin.
-  --disable-dnskey        disable DNS RR key decoding plugin.
+  --disable-pubkey        disable RAW public key support plugin.
   --disable-sshkey        disable SSH key decoding plugin.
-  --enable-dnscert        enable DNSCERT authentication plugin.
-  --enable-ipseckey       enable IPSECKEY authentication plugin.
-  --disable-pem           disable PEM decoding plugin.
-  --disable-hmac          disable HMAC crypto implementation plugin.
-  --disable-cmac          disable CMAC crypto implementation plugin.
-  --disable-xcbc          disable xcbc crypto implementation plugin.
-  --enable-af-alg         enable AF_ALG crypto interface to Linux Crypto API.
-  --enable-test-vectors   enable plugin providing crypto test vectors.
+  --disable-x509          disable X509 certificate implementation plugin.
+  --enable-curl           enable CURL fetcher plugin to fetch files via
+                          libcurl. Requires libcurl.
+  --enable-ldap           enable LDAP fetching plugin to fetch files via
+                          libldap. Requires openLDAP.
+  --enable-soup           enable soup fetcher plugin to fetch from HTTP via
+                          libsoup. Requires libsoup.
+  --enable-unbound        enable UNBOUND resolver plugin to perform DNS
+                          queries via libunbound. Requires libldns and
+                          libunbound.
   --enable-mysql          enable MySQL database support. Requires
                           libmysqlclient_r.
   --enable-sqlite         enable SQLite database support. Requires libsqlite3.
-  --disable-stroke        disable charons stroke configuration backend.
-  --enable-medsrv         enable mediation server web frontend and daemon
-                          plugin.
-  --enable-medcli         enable mediation client configuration database
-                          plugin.
-  --enable-smp            enable SMP configuration and control interface.
-                          Requires libxml.
-  --enable-sql            enable SQL database configuration backend.
-  --enable-leak-detective enable malloc hooks to find memory leaks.
-  --enable-lock-profiler  enable lock/mutex profiling code.
-  --enable-unit-tester    enable unit tests on IKEv2 daemon startup.
-  --enable-load-tester    enable load testing plugin for IKEv2 daemon.
+  --enable-addrblock      enables RFC 3779 address block constraint support.
+  --enable-acert          enable X509 attribute certificate checking plugin.
+  --enable-agent          enables the ssh-agent signing plugin.
+  --disable-constraints   disable advanced X509 constraint checking plugin.
+  --enable-coupling       enable IKEv2 plugin to couple peer certificates
+                          permanently to authentication.
+  --enable-dnscert        enable DNSCERT authentication plugin.
   --enable-eap-sim        enable SIM authentication module for EAP.
   --enable-eap-sim-file   enable EAP-SIM backend based on a triplet file.
   --enable-eap-sim-pcsc   enable EAP-SIM backend based on a smartcard reader.
@@ -2088,31 +2088,17 @@ Optional Features:
   --enable-eap-tnc        enable EAP TNC trusted network connect module.
   --enable-eap-dynamic    enable dynamic EAP proxy module.
   --enable-eap-radius     enable RADIUS proxy authentication module.
+  --enable-ipseckey       enable IPSECKEY authentication plugin.
+  --enable-keychain       enables OS X Keychain Services credential set.
+  --enable-pkcs11         enables the PKCS11 token support plugin.
+  --disable-revocation    disable X509 CRL/OCSP revocation check plugin.
+  --enable-whitelist      enable peer identity whitelisting plugin.
   --disable-xauth-generic disable generic XAuth backend.
   --enable-xauth-eap      enable XAuth backend using EAP methods to verify
                           passwords.
   --enable-xauth-pam      enable XAuth backend using PAM to verify passwords.
   --enable-xauth-noauth   enable XAuth pseudo-backend that does not actually
                           verify or even request any credentials.
-  --enable-tnc-ifmap      enable TNC IF-MAP module. Requires libxml
-  --enable-tnc-pdp        enable TNC policy decision point module.
-  --enable-tnc-imc        enable TNC IMC module.
-  --enable-tnc-imv        enable TNC IMV module.
-  --enable-tnccs-11       enable TNCCS 1.1 protocol module. Requires libxml
-  --enable-tnccs-20       enable TNCCS 2.0 protocol module.
-  --enable-tnccs-dynamic  enable dynamic TNCCS protocol discovery module.
-  --enable-imc-test       enable IMC test module.
-  --enable-imv-test       enable IMV test module.
-  --enable-imc-scanner    enable IMC port scanner module.
-  --enable-imv-scanner    enable IMV port scanner module.
-  --enable-imc-os         enable IMC operating system module.
-  --enable-imv-os         enable IMV operating system module.
-  --enable-imc-attestation
-                          enable IMC attestation module.
-  --enable-imv-attestation
-                          enable IMV attestation module.
-  --enable-imc-swid       enable IMC swid module.
-  --enable-imv-swid       enable IMV swid module.
   --disable-kernel-netlink
                           disable the netlink kernel interface.
   --enable-kernel-pfkey   enable the PF_KEY kernel interface.
@@ -2120,85 +2106,103 @@ Optional Features:
   --enable-kernel-klips   enable the KLIPS kernel interface.
   --enable-kernel-libipsec
                           enable the libipsec kernel interface.
-  --enable-libipsec       enable user space IPsec implementation.
   --disable-socket-default
                           disable default socket implementation for charon.
   --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-dumm           enable the DUMM UML test framework.
-  --enable-fast           enable libfast (FastCGI Application Server w/
-                          templates.
-  --enable-manager        enable web management console (proof of concept).
-  --enable-mediation      enable IKEv2 Mediation Extension.
-  --enable-integrity-test enable integrity testing of libstrongswan and
-                          plugins.
-  --disable-load-warning  disable the charon plugin load option warning in
-                          starter.
-  --disable-ikev1         disable IKEv1 protocol support in charon.
-  --disable-ikev2         disable IKEv2 protocol support in charon.
-  --disable-charon        disable the IKEv1/IKEv2 keying daemon charon.
-  --disable-tools         disable additional utilities (openac, scepclient and
-                          pki).
-  --disable-scripts       disable additional utilities (found in directory
-                          scripts).
-  --enable-conftest       enforce Suite B conformance test framework.
-  --disable-updown        disable updown firewall script plugin.
+  --disable-stroke        disable charons stroke configuration backend.
+  --enable-smp            enable SMP configuration and control interface.
+                          Requires libxml.
+  --enable-sql            enable SQL database configuration backend.
+  --enable-uci            enable OpenWRT UCI configuration plugin.
+  --enable-android-dns    enable Android specific DNS handler.
   --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.
+  --enable-osx-attr       enable OS X SystemConfiguration attribute handler.
   --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-keychain       enables OS X Keychain Services credential set.
-  --enable-pkcs11         enables the PKCS11 token support plugin.
-  --enable-ctr            enables the Counter Mode wrapper crypto plugin.
-  --enable-ccm            enables the CCM AEAD wrapper crypto plugin.
-  --enable-gcm            enables the GCM AEAD wrapper crypto plugin.
-  --enable-ntru           enables the NTRU crypto plugin.
-  --enable-addrblock      enables RFC 3779 address block constraint support.
   --enable-unity          enables Cisco Unity extension plugin.
-  --enable-uci            enable OpenWRT UCI configuration plugin.
-  --enable-osx-attr       enable OS X SystemConfiguration attribute handler.
-  --enable-android-dns    enable Android specific DNS handler.
+  --enable-imc-test       enable IMC test module.
+  --enable-imv-test       enable IMV test module.
+  --enable-imc-scanner    enable IMC port scanner module.
+  --enable-imv-scanner    enable IMV port scanner module.
+  --enable-imc-os         enable IMC operating system module.
+  --enable-imv-os         enable IMV operating system module.
+  --enable-imc-attestation
+                          enable IMC attestation module.
+  --enable-imv-attestation
+                          enable IMV attestation module.
+  --enable-imc-swid       enable IMC swid module.
+  --enable-imv-swid       enable IMV swid module.
+  --enable-tnc-ifmap      enable TNC IF-MAP module. Requires libxml
+  --enable-tnc-imc        enable TNC IMC module.
+  --enable-tnc-imv        enable TNC IMV module.
+  --enable-tnc-pdp        enable TNC policy decision point module.
+  --enable-tnccs-11       enable TNCCS 1.1 protocol module. Requires libxml
+  --enable-tnccs-20       enable TNCCS 2.0 protocol module.
+  --enable-tnccs-dynamic  enable dynamic TNCCS protocol discovery module.
   --enable-android-log    enable Android specific logger plugin.
-  --enable-maemo          enable Maemo specific plugin.
-  --enable-nm             enable NetworkManager backend.
-  --enable-ha             enable high availability cluster plugin.
-  --enable-whitelist      enable peer identity whitelisting plugin.
-  --enable-lookip         enable fast virtual IP lookup and notification
-                          plugin.
-  --enable-error-notify   enable error notification plugin.
   --enable-certexpire     enable CSV export of expiration dates of used
                           certificates.
-  --enable-systime-fix    enable plugin to handle cert lifetimes with invalid
-                          system time gracefully.
-  --enable-led            enable plugin to control LEDs on IKEv2 activity
-                          using the Linux kernel LED subsystem.
   --enable-duplicheck     advanced duplicate checking plugin using liveness
                           checks.
-  --enable-coupling       enable IKEv2 plugin to couple peer certificates
-                          permanently to authentication.
+  --enable-error-notify   enable error notification plugin.
+  --enable-farp           enable ARP faking plugin that responds to ARP
+                          requests to peers virtual IP
+  --enable-ha             enable high availability cluster plugin.
+  --enable-led            enable plugin to control LEDs on IKEv2 activity
+                          using the Linux kernel LED subsystem.
+  --enable-load-tester    enable load testing plugin for IKEv2 daemon.
+  --enable-lookip         enable fast virtual IP lookup and notification
+                          plugin.
+  --enable-maemo          enable Maemo specific plugin.
   --enable-radattr        enable plugin to inject and process custom RADIUS
                           attributes as IKEv2 client.
-  --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.
+  --enable-systime-fix    enable plugin to handle cert lifetimes with invalid
+                          system time gracefully.
+  --enable-test-vectors   enable plugin providing crypto test vectors.
+  --enable-unit-tester    enable unit tests on IKEv2 daemon startup.
+  --disable-updown        disable updown firewall script plugin.
+  --disable-charon        disable the IKEv1/IKEv2 keying daemon charon.
+  --enable-cmd            enable the command line IKE client charon-cmd.
+  --enable-conftest       enforce Suite B conformance test framework.
+  --enable-dumm           enable the DUMM UML test framework.
+  --enable-fast           enable libfast (FastCGI Application Server w/
+                          templates.
+  --enable-libipsec       enable user space IPsec implementation.
+  --enable-manager        enable web management console (proof of concept).
+  --enable-medcli         enable mediation client configuration database
+                          plugin.
+  --enable-medsrv         enable mediation server web frontend and daemon
+                          plugin.
+  --enable-nm             enable NetworkManager backend.
+  --disable-scripts       disable additional utilities (found in directory
+                          scripts).
+  --enable-tkm            enable Trusted Key Manager support.
+  --disable-tools         disable additional utilities (scepclient and pki).
   --enable-bfd-backtraces use binutils libbfd to resolve backtraces for memory
                           leaks and segfaults.
+  --disable-ikev1         disable IKEv1 protocol support in charon.
+  --disable-ikev2         disable IKEv2 protocol support in charon.
+  --enable-integrity-test enable integrity testing of libstrongswan and
+                          plugins.
+  --disable-load-warning  disable the charon plugin load option warning in
+                          starter.
+  --enable-mediation      enable IKEv2 Mediation Extension.
   --enable-unwind-backtraces
                           use libunwind to create backtraces for memory leaks
                           and segfaults.
   --enable-coverage       enable lcov coverage report generation.
-  --enable-tkm            enable Trusted Key Manager support.
-  --enable-cmd            enable the command line IKE client charon-cmd.
+  --enable-leak-detective enable malloc hooks to find memory leaks.
+  --enable-lock-profiler  enable lock/mutex profiling code.
+  --enable-monolithic     build monolithic version of libstrongswan that
+                          includes all enabled plugins. Similarly, the plugins
+                          of charon are assembled in libcharon.
   --disable-defaults      disable all default plugins (they can be enabled
                           with their respective --enable options)
+  --enable-all            enable all plugins and features (they can be
+                          disabled with their respective --disable options).
+                          Mainly for testing.
   --enable-dependency-tracking
                           do not reject slow dependency extractors
   --disable-dependency-tracking
@@ -2257,6 +2261,9 @@ Optional Packages:
                           libgmp, if available (default: yes).
   --with-dev-headers=arg  install strongSwan development headers to directory.
                           (default: no).
+  --with-printf-hooks=arg force the use of a specific printf hook
+                          implementation (auto, builtin, glibc, vstr).
+                          (default: auto).
   --with-systemdsystemunitdir=arg
                           directory for systemd service files (default:
                           $systemdsystemunitdir_default).
@@ -2382,7 +2389,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-strongSwan configure 5.1.2
+strongSwan configure 5.1.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2904,7 +2911,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 5.1.2, which was
+It was created by strongSwan $as_me 5.1.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3767,7 +3774,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='strongswan'
- VERSION='5.1.2'
+ VERSION='5.1.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4426,6 +4433,16 @@ fi
 
 
 
+# Check whether --with-printf-hooks was given.
+if test "${with_printf_hooks+set}" = set; then :
+  withval=$with_printf_hooks; printf_hooks="$withval"
+else
+  printf_hooks=auto
+
+fi
+
+
+
 if test -n "$PKG_CONFIG"; then
 	systemdsystemunitdir_default=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
 fi
@@ -4534,6 +4551,7 @@ ipsec_script_upper=`echo -n "$ipsec_script" | tr a-z A-Z`
 # ARG_ENABL_SET(option, help)
 # ---------------------------
 # Create a --enable-$1 option with helptext, set a variable $1 to true/false
+# All $1 are collected in the variable $disabled_by_default
 
 
 # ARG_DISBL_SET(option, help)
@@ -4543,81 +4561,102 @@ ipsec_script_upper=`echo -n "$ipsec_script" | tr a-z A-Z`
 
 
 
-# Check whether --enable-curl was given.
-if test "${enable_curl+set}" = set; then :
-  enableval=$enable_curl; curl_given=true
+# crypto plugins
+# Check whether --enable-aes was given.
+if test "${enable_aes+set}" = set; then :
+  enableval=$enable_aes; aes_given=true
 		if test x$enableval = xyes; then
-			curl=true
+			aes=true
 		 else
-			curl=false
+			aes=false
 		fi
 else
-  curl=false
-		curl_given=false
+  aes=true
+		aes_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" aes"
 
-# Check whether --enable-unbound was given.
-if test "${enable_unbound+set}" = set; then :
-  enableval=$enable_unbound; unbound_given=true
+# Check whether --enable-af-alg was given.
+if test "${enable_af_alg+set}" = set; then :
+  enableval=$enable_af_alg; af_alg_given=true
 		if test x$enableval = xyes; then
-			unbound=true
+			af_alg=true
 		 else
-			unbound=false
+			af_alg=false
 		fi
 else
-  unbound=false
-		unbound_given=false
+  af_alg=false
+		af_alg_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" af_alg"
 
-# Check whether --enable-soup was given.
-if test "${enable_soup+set}" = set; then :
-  enableval=$enable_soup; soup_given=true
+# Check whether --enable-blowfish was given.
+if test "${enable_blowfish+set}" = set; then :
+  enableval=$enable_blowfish; blowfish_given=true
 		if test x$enableval = xyes; then
-			soup=true
+			blowfish=true
 		 else
-			soup=false
+			blowfish=false
 		fi
 else
-  soup=false
-		soup_given=false
+  blowfish=false
+		blowfish_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" blowfish"
 
-# Check whether --enable-ldap was given.
-if test "${enable_ldap+set}" = set; then :
-  enableval=$enable_ldap; ldap_given=true
+# Check whether --enable-ccm was given.
+if test "${enable_ccm+set}" = set; then :
+  enableval=$enable_ccm; ccm_given=true
 		if test x$enableval = xyes; then
-			ldap=true
+			ccm=true
 		 else
-			ldap=false
+			ccm=false
 		fi
 else
-  ldap=false
-		ldap_given=false
+  ccm=false
+		ccm_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" ccm"
 
-# Check whether --enable-aes was given.
-if test "${enable_aes+set}" = set; then :
-  enableval=$enable_aes; aes_given=true
+# Check whether --enable-cmac was given.
+if test "${enable_cmac+set}" = set; then :
+  enableval=$enable_cmac; cmac_given=true
 		if test x$enableval = xyes; then
-			aes=true
+			cmac=true
 		 else
-			aes=false
+			cmac=false
 		fi
 else
-  aes=true
-		aes_given=false
+  cmac=true
+		cmac_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" aes"
+	enabled_by_default=${enabled_by_default}" cmac"
+
+# Check whether --enable-ctr was given.
+if test "${enable_ctr+set}" = set; then :
+  enableval=$enable_ctr; ctr_given=true
+		if test x$enableval = xyes; then
+			ctr=true
+		 else
+			ctr=false
+		fi
+else
+  ctr=false
+		ctr_given=false
+
+fi
+
+	disabled_by_default=${disabled_by_default}" ctr"
 
 # Check whether --enable-des was given.
 if test "${enable_des+set}" = set; then :
@@ -4635,36 +4674,85 @@ fi
 
 	enabled_by_default=${enabled_by_default}" des"
 
-# Check whether --enable-blowfish was given.
-if test "${enable_blowfish+set}" = set; then :
-  enableval=$enable_blowfish; blowfish_given=true
+# Check whether --enable-fips-prf was given.
+if test "${enable_fips_prf+set}" = set; then :
+  enableval=$enable_fips_prf; fips_prf_given=true
 		if test x$enableval = xyes; then
-			blowfish=true
+			fips_prf=true
 		 else
-			blowfish=false
+			fips_prf=false
 		fi
 else
-  blowfish=false
-		blowfish_given=false
+  fips_prf=true
+		fips_prf_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" fips_prf"
 
-# Check whether --enable-rc2 was given.
-if test "${enable_rc2+set}" = set; then :
-  enableval=$enable_rc2; rc2_given=true
+# Check whether --enable-gcm was given.
+if test "${enable_gcm+set}" = set; then :
+  enableval=$enable_gcm; gcm_given=true
 		if test x$enableval = xyes; then
-			rc2=true
+			gcm=true
 		 else
-			rc2=false
+			gcm=false
 		fi
 else
-  rc2=true
-		rc2_given=false
+  gcm=false
+		gcm_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" rc2"
+	disabled_by_default=${disabled_by_default}" gcm"
+
+# Check whether --enable-gcrypt was given.
+if test "${enable_gcrypt+set}" = set; 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
+
+	disabled_by_default=${disabled_by_default}" gcrypt"
+
+# Check whether --enable-gmp was given.
+if test "${enable_gmp+set}" = set; 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
+
+	enabled_by_default=${enabled_by_default}" gmp"
+
+# Check whether --enable-hmac was given.
+if test "${enable_hmac+set}" = set; 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
+
+	enabled_by_default=${enabled_by_default}" hmac"
 
 # Check whether --enable-md4 was given.
 if test "${enable_md4+set}" = set; then :
@@ -4680,6 +4768,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" md4"
 
 # Check whether --enable-md5 was given.
 if test "${enable_md5+set}" = set; then :
@@ -4697,69 +4786,101 @@ fi
 
 	enabled_by_default=${enabled_by_default}" md5"
 
-# Check whether --enable-sha1 was given.
-if test "${enable_sha1+set}" = set; then :
-  enableval=$enable_sha1; sha1_given=true
+# Check whether --enable-nonce was given.
+if test "${enable_nonce+set}" = set; then :
+  enableval=$enable_nonce; nonce_given=true
 		if test x$enableval = xyes; then
-			sha1=true
+			nonce=true
 		 else
-			sha1=false
+			nonce=false
 		fi
 else
-  sha1=true
-		sha1_given=false
+  nonce=true
+		nonce_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" sha1"
+	enabled_by_default=${enabled_by_default}" nonce"
 
-# Check whether --enable-sha2 was given.
-if test "${enable_sha2+set}" = set; then :
-  enableval=$enable_sha2; sha2_given=true
+# Check whether --enable-ntru was given.
+if test "${enable_ntru+set}" = set; then :
+  enableval=$enable_ntru; ntru_given=true
 		if test x$enableval = xyes; then
-			sha2=true
+			ntru=true
 		 else
-			sha2=false
+			ntru=false
 		fi
 else
-  sha2=true
-		sha2_given=false
+  ntru=false
+		ntru_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" sha2"
+	disabled_by_default=${disabled_by_default}" ntru"
 
-# Check whether --enable-fips-prf was given.
-if test "${enable_fips_prf+set}" = set; then :
-  enableval=$enable_fips_prf; fips_prf_given=true
+# Check whether --enable-openssl was given.
+if test "${enable_openssl+set}" = set; then :
+  enableval=$enable_openssl; openssl_given=true
 		if test x$enableval = xyes; then
-			fips_prf=true
+			openssl=true
 		 else
-			fips_prf=false
+			openssl=false
 		fi
 else
-  fips_prf=true
-		fips_prf_given=false
+  openssl=false
+		openssl_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" fips_prf"
+	disabled_by_default=${disabled_by_default}" openssl"
 
-# Check whether --enable-gmp was given.
-if test "${enable_gmp+set}" = set; then :
-  enableval=$enable_gmp; gmp_given=true
+# Check whether --enable-padlock was given.
+if test "${enable_padlock+set}" = set; then :
+  enableval=$enable_padlock; padlock_given=true
 		if test x$enableval = xyes; then
-			gmp=true
+			padlock=true
 		 else
-			gmp=false
+			padlock=false
 		fi
 else
-  gmp=true
-		gmp_given=false
+  padlock=false
+		padlock_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" gmp"
+	disabled_by_default=${disabled_by_default}" padlock"
+
+# Check whether --enable-random was given.
+if test "${enable_random+set}" = set; 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
+
+	enabled_by_default=${enabled_by_default}" random"
+
+# Check whether --enable-rc2 was given.
+if test "${enable_rc2+set}" = set; then :
+  enableval=$enable_rc2; rc2_given=true
+		if test x$enableval = xyes; then
+			rc2=true
+		 else
+			rc2=false
+		fi
+else
+  rc2=true
+		rc2_given=false
+
+fi
+
+	enabled_by_default=${enabled_by_default}" rc2"
 
 # Check whether --enable-rdrand was given.
 if test "${enable_rdrand+set}" = set; then :
@@ -4775,102 +4896,104 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" rdrand"
 
-# Check whether --enable-random was given.
-if test "${enable_random+set}" = set; then :
-  enableval=$enable_random; random_given=true
+# Check whether --enable-sha1 was given.
+if test "${enable_sha1+set}" = set; then :
+  enableval=$enable_sha1; sha1_given=true
 		if test x$enableval = xyes; then
-			random=true
+			sha1=true
 		 else
-			random=false
+			sha1=false
 		fi
 else
-  random=true
-		random_given=false
+  sha1=true
+		sha1_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" random"
+	enabled_by_default=${enabled_by_default}" sha1"
 
-# Check whether --enable-nonce was given.
-if test "${enable_nonce+set}" = set; then :
-  enableval=$enable_nonce; nonce_given=true
+# Check whether --enable-sha2 was given.
+if test "${enable_sha2+set}" = set; then :
+  enableval=$enable_sha2; sha2_given=true
 		if test x$enableval = xyes; then
-			nonce=true
+			sha2=true
 		 else
-			nonce=false
+			sha2=false
 		fi
 else
-  nonce=true
-		nonce_given=false
+  sha2=true
+		sha2_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" nonce"
+	enabled_by_default=${enabled_by_default}" sha2"
 
-# Check whether --enable-x509 was given.
-if test "${enable_x509+set}" = set; then :
-  enableval=$enable_x509; x509_given=true
+# Check whether --enable-xcbc was given.
+if test "${enable_xcbc+set}" = set; then :
+  enableval=$enable_xcbc; xcbc_given=true
 		if test x$enableval = xyes; then
-			x509=true
+			xcbc=true
 		 else
-			x509=false
+			xcbc=false
 		fi
 else
-  x509=true
-		x509_given=false
+  xcbc=true
+		xcbc_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" x509"
+	enabled_by_default=${enabled_by_default}" xcbc"
 
-# Check whether --enable-revocation was given.
-if test "${enable_revocation+set}" = set; then :
-  enableval=$enable_revocation; revocation_given=true
+# encoding/decoding plugins
+# Check whether --enable-dnskey was given.
+if test "${enable_dnskey+set}" = set; then :
+  enableval=$enable_dnskey; dnskey_given=true
 		if test x$enableval = xyes; then
-			revocation=true
+			dnskey=true
 		 else
-			revocation=false
+			dnskey=false
 		fi
 else
-  revocation=true
-		revocation_given=false
+  dnskey=true
+		dnskey_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" revocation"
+	enabled_by_default=${enabled_by_default}" dnskey"
 
-# Check whether --enable-constraints was given.
-if test "${enable_constraints+set}" = set; then :
-  enableval=$enable_constraints; constraints_given=true
+# Check whether --enable-pem was given.
+if test "${enable_pem+set}" = set; then :
+  enableval=$enable_pem; pem_given=true
 		if test x$enableval = xyes; then
-			constraints=true
+			pem=true
 		 else
-			constraints=false
+			pem=false
 		fi
 else
-  constraints=true
-		constraints_given=false
+  pem=true
+		pem_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" constraints"
+	enabled_by_default=${enabled_by_default}" pem"
 
-# Check whether --enable-pubkey was given.
-if test "${enable_pubkey+set}" = set; then :
-  enableval=$enable_pubkey; pubkey_given=true
+# Check whether --enable-pgp was given.
+if test "${enable_pgp+set}" = set; then :
+  enableval=$enable_pgp; pgp_given=true
 		if test x$enableval = xyes; then
-			pubkey=true
+			pgp=true
 		 else
-			pubkey=false
+			pgp=false
 		fi
 else
-  pubkey=true
-		pubkey_given=false
+  pgp=true
+		pgp_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" pubkey"
+	enabled_by_default=${enabled_by_default}" pgp"
 
 # Check whether --enable-pkcs1 was given.
 if test "${enable_pkcs1+set}" = set; then :
@@ -4936,37 +5059,21 @@ fi
 
 	enabled_by_default=${enabled_by_default}" pkcs12"
 
-# Check whether --enable-pgp was given.
-if test "${enable_pgp+set}" = set; 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
-
-	enabled_by_default=${enabled_by_default}" pgp"
-
-# Check whether --enable-dnskey was given.
-if test "${enable_dnskey+set}" = set; then :
-  enableval=$enable_dnskey; dnskey_given=true
+# Check whether --enable-pubkey was given.
+if test "${enable_pubkey+set}" = set; then :
+  enableval=$enable_pubkey; pubkey_given=true
 		if test x$enableval = xyes; then
-			dnskey=true
+			pubkey=true
 		 else
-			dnskey=false
+			pubkey=false
 		fi
 else
-  dnskey=true
-		dnskey_given=false
+  pubkey=true
+		pubkey_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" dnskey"
+	enabled_by_default=${enabled_by_default}" pubkey"
 
 # Check whether --enable-sshkey was given.
 if test "${enable_sshkey+set}" = set; then :
@@ -4984,130 +5091,88 @@ fi
 
 	enabled_by_default=${enabled_by_default}" sshkey"
 
-# Check whether --enable-dnscert was given.
-if test "${enable_dnscert+set}" = set; then :
-  enableval=$enable_dnscert; dnscert_given=true
-		if test x$enableval = xyes; then
-			dnscert=true
-		 else
-			dnscert=false
-		fi
-else
-  dnscert=false
-		dnscert_given=false
-
-fi
-
-
-# Check whether --enable-ipseckey was given.
-if test "${enable_ipseckey+set}" = set; then :
-  enableval=$enable_ipseckey; ipseckey_given=true
-		if test x$enableval = xyes; then
-			ipseckey=true
-		 else
-			ipseckey=false
-		fi
-else
-  ipseckey=false
-		ipseckey_given=false
-
-fi
-
-
-# Check whether --enable-pem was given.
-if test "${enable_pem+set}" = set; 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
-
-	enabled_by_default=${enabled_by_default}" pem"
-
-# Check whether --enable-hmac was given.
-if test "${enable_hmac+set}" = set; then :
-  enableval=$enable_hmac; hmac_given=true
+# Check whether --enable-x509 was given.
+if test "${enable_x509+set}" = set; then :
+  enableval=$enable_x509; x509_given=true
 		if test x$enableval = xyes; then
-			hmac=true
+			x509=true
 		 else
-			hmac=false
+			x509=false
 		fi
 else
-  hmac=true
-		hmac_given=false
+  x509=true
+		x509_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" hmac"
+	enabled_by_default=${enabled_by_default}" x509"
 
-# Check whether --enable-cmac was given.
-if test "${enable_cmac+set}" = set; then :
-  enableval=$enable_cmac; cmac_given=true
+# fetcher/resolver plugins
+# Check whether --enable-curl was given.
+if test "${enable_curl+set}" = set; then :
+  enableval=$enable_curl; curl_given=true
 		if test x$enableval = xyes; then
-			cmac=true
+			curl=true
 		 else
-			cmac=false
+			curl=false
 		fi
 else
-  cmac=true
-		cmac_given=false
+  curl=false
+		curl_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" cmac"
+	disabled_by_default=${disabled_by_default}" curl"
 
-# Check whether --enable-xcbc was given.
-if test "${enable_xcbc+set}" = set; then :
-  enableval=$enable_xcbc; xcbc_given=true
+# Check whether --enable-ldap was given.
+if test "${enable_ldap+set}" = set; then :
+  enableval=$enable_ldap; ldap_given=true
 		if test x$enableval = xyes; then
-			xcbc=true
+			ldap=true
 		 else
-			xcbc=false
+			ldap=false
 		fi
 else
-  xcbc=true
-		xcbc_given=false
+  ldap=false
+		ldap_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" xcbc"
+	disabled_by_default=${disabled_by_default}" ldap"
 
-# Check whether --enable-af-alg was given.
-if test "${enable_af_alg+set}" = set; then :
-  enableval=$enable_af_alg; af_alg_given=true
+# Check whether --enable-soup was given.
+if test "${enable_soup+set}" = set; then :
+  enableval=$enable_soup; soup_given=true
 		if test x$enableval = xyes; then
-			af_alg=true
+			soup=true
 		 else
-			af_alg=false
+			soup=false
 		fi
 else
-  af_alg=false
-		af_alg_given=false
+  soup=false
+		soup_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" soup"
 
-# Check whether --enable-test-vectors was given.
-if test "${enable_test_vectors+set}" = set; then :
-  enableval=$enable_test_vectors; test_vectors_given=true
+# Check whether --enable-unbound was given.
+if test "${enable_unbound+set}" = set; then :
+  enableval=$enable_unbound; unbound_given=true
 		if test x$enableval = xyes; then
-			test_vectors=true
+			unbound=true
 		 else
-			test_vectors=false
+			unbound=false
 		fi
 else
-  test_vectors=false
-		test_vectors_given=false
+  unbound=false
+		unbound_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" unbound"
 
+# database plugins
 # Check whether --enable-mysql was given.
 if test "${enable_mysql+set}" = set; then :
   enableval=$enable_mysql; mysql_given=true
@@ -5122,6 +5187,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" mysql"
 
 # Check whether --enable-sqlite was given.
 if test "${enable_sqlite+set}" = set; then :
@@ -5137,142 +5203,104 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" sqlite"
 
-# Check whether --enable-stroke was given.
-if test "${enable_stroke+set}" = set; 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
-
-	enabled_by_default=${enabled_by_default}" stroke"
-
-# Check whether --enable-medsrv was given.
-if test "${enable_medsrv+set}" = set; 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; 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; smp_given=true
+# authentication/credential plugins
+# Check whether --enable-addrblock was given.
+if test "${enable_addrblock+set}" = set; then :
+  enableval=$enable_addrblock; addrblock_given=true
 		if test x$enableval = xyes; then
-			smp=true
+			addrblock=true
 		 else
-			smp=false
+			addrblock=false
 		fi
 else
-  smp=false
-		smp_given=false
+  addrblock=false
+		addrblock_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" addrblock"
 
-# Check whether --enable-sql was given.
-if test "${enable_sql+set}" = set; then :
-  enableval=$enable_sql; sql_given=true
+# Check whether --enable-acert was given.
+if test "${enable_acert+set}" = set; then :
+  enableval=$enable_acert; acert_given=true
 		if test x$enableval = xyes; then
-			sql=true
+			acert=true
 		 else
-			sql=false
+			acert=false
 		fi
 else
-  sql=false
-		sql_given=false
+  acert=false
+		acert_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" acert"
 
-# Check whether --enable-leak-detective was given.
-if test "${enable_leak_detective+set}" = set; then :
-  enableval=$enable_leak_detective; leak_detective_given=true
+# Check whether --enable-agent was given.
+if test "${enable_agent+set}" = set; then :
+  enableval=$enable_agent; agent_given=true
 		if test x$enableval = xyes; then
-			leak_detective=true
+			agent=true
 		 else
-			leak_detective=false
+			agent=false
 		fi
 else
-  leak_detective=false
-		leak_detective_given=false
+  agent=false
+		agent_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" agent"
 
-# Check whether --enable-lock-profiler was given.
-if test "${enable_lock_profiler+set}" = set; then :
-  enableval=$enable_lock_profiler; lock_profiler_given=true
+# Check whether --enable-constraints was given.
+if test "${enable_constraints+set}" = set; then :
+  enableval=$enable_constraints; constraints_given=true
 		if test x$enableval = xyes; then
-			lock_profiler=true
+			constraints=true
 		 else
-			lock_profiler=false
+			constraints=false
 		fi
 else
-  lock_profiler=false
-		lock_profiler_given=false
+  constraints=true
+		constraints_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" constraints"
 
-# Check whether --enable-unit-tester was given.
-if test "${enable_unit_tester+set}" = set; then :
-  enableval=$enable_unit_tester; unit_tester_given=true
+# Check whether --enable-coupling was given.
+if test "${enable_coupling+set}" = set; then :
+  enableval=$enable_coupling; coupling_given=true
 		if test x$enableval = xyes; then
-			unit_tester=true
+			coupling=true
 		 else
-			unit_tester=false
+			coupling=false
 		fi
 else
-  unit_tester=false
-		unit_tester_given=false
+  coupling=false
+		coupling_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" coupling"
 
-# Check whether --enable-load-tester was given.
-if test "${enable_load_tester+set}" = set; then :
-  enableval=$enable_load_tester; load_tester_given=true
+# Check whether --enable-dnscert was given.
+if test "${enable_dnscert+set}" = set; then :
+  enableval=$enable_dnscert; dnscert_given=true
 		if test x$enableval = xyes; then
-			load_tester=true
+			dnscert=true
 		 else
-			load_tester=false
+			dnscert=false
 		fi
 else
-  load_tester=false
-		load_tester_given=false
+  dnscert=false
+		dnscert_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" dnscert"
 
 # Check whether --enable-eap-sim was given.
 if test "${enable_eap_sim+set}" = set; then :
@@ -5288,6 +5316,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_sim"
 
 # Check whether --enable-eap-sim-file was given.
 if test "${enable_eap_sim_file+set}" = set; then :
@@ -5303,6 +5332,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_sim_file"
 
 # Check whether --enable-eap-sim-pcsc was given.
 if test "${enable_eap_sim_pcsc+set}" = set; then :
@@ -5318,6 +5348,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_sim_pcsc"
 
 # Check whether --enable-eap-aka was given.
 if test "${enable_eap_aka+set}" = set; then :
@@ -5333,6 +5364,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_aka"
 
 # Check whether --enable-eap-aka-3gpp2 was given.
 if test "${enable_eap_aka_3gpp2+set}" = set; then :
@@ -5348,6 +5380,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_aka_3gpp2"
 
 # Check whether --enable-eap-simaka-sql was given.
 if test "${enable_eap_simaka_sql+set}" = set; then :
@@ -5363,6 +5396,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_simaka_sql"
 
 # Check whether --enable-eap-simaka-pseudonym was given.
 if test "${enable_eap_simaka_pseudonym+set}" = set; then :
@@ -5378,6 +5412,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_simaka_pseudonym"
 
 # Check whether --enable-eap-simaka-reauth was given.
 if test "${enable_eap_simaka_reauth+set}" = set; then :
@@ -5393,6 +5428,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_simaka_reauth"
 
 # Check whether --enable-eap-identity was given.
 if test "${enable_eap_identity+set}" = set; then :
@@ -5408,6 +5444,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_identity"
 
 # Check whether --enable-eap-md5 was given.
 if test "${enable_eap_md5+set}" = set; then :
@@ -5423,6 +5460,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_md5"
 
 # Check whether --enable-eap-gtc was given.
 if test "${enable_eap_gtc+set}" = set; then :
@@ -5438,6 +5476,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_gtc"
 
 # Check whether --enable-eap-mschapv2 was given.
 if test "${enable_eap_mschapv2+set}" = set; then :
@@ -5453,6 +5492,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_mschapv2"
 
 # Check whether --enable-eap-tls was given.
 if test "${enable_eap_tls+set}" = set; then :
@@ -5468,6 +5508,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_tls"
 
 # Check whether --enable-eap-ttls was given.
 if test "${enable_eap_ttls+set}" = set; then :
@@ -5483,6 +5524,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_ttls"
 
 # Check whether --enable-eap-peap was given.
 if test "${enable_eap_peap+set}" = set; then :
@@ -5498,6 +5540,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_peap"
 
 # Check whether --enable-eap-tnc was given.
 if test "${enable_eap_tnc+set}" = set; then :
@@ -5513,6 +5556,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_tnc"
 
 # Check whether --enable-eap-dynamic was given.
 if test "${enable_eap_dynamic+set}" = set; then :
@@ -5528,6 +5572,7 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_dynamic"
 
 # Check whether --enable-eap-radius was given.
 if test "${enable_eap_radius+set}" = set; then :
@@ -5543,1188 +5588,1262 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" eap_radius"
 
-# Check whether --enable-xauth-generic was given.
-if test "${enable_xauth_generic+set}" = set; then :
-  enableval=$enable_xauth_generic; xauth_generic_given=true
+# Check whether --enable-ipseckey was given.
+if test "${enable_ipseckey+set}" = set; then :
+  enableval=$enable_ipseckey; ipseckey_given=true
 		if test x$enableval = xyes; then
-			xauth_generic=true
+			ipseckey=true
 		 else
-			xauth_generic=false
+			ipseckey=false
 		fi
 else
-  xauth_generic=true
-		xauth_generic_given=false
+  ipseckey=false
+		ipseckey_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" xauth_generic"
+	disabled_by_default=${disabled_by_default}" ipseckey"
 
-# Check whether --enable-xauth-eap was given.
-if test "${enable_xauth_eap+set}" = set; then :
-  enableval=$enable_xauth_eap; xauth_eap_given=true
+# Check whether --enable-keychain was given.
+if test "${enable_keychain+set}" = set; then :
+  enableval=$enable_keychain; keychain_given=true
 		if test x$enableval = xyes; then
-			xauth_eap=true
+			keychain=true
 		 else
-			xauth_eap=false
+			keychain=false
 		fi
 else
-  xauth_eap=false
-		xauth_eap_given=false
+  keychain=false
+		keychain_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" keychain"
 
-# Check whether --enable-xauth-pam was given.
-if test "${enable_xauth_pam+set}" = set; then :
-  enableval=$enable_xauth_pam; xauth_pam_given=true
+# Check whether --enable-pkcs11 was given.
+if test "${enable_pkcs11+set}" = set; then :
+  enableval=$enable_pkcs11; pkcs11_given=true
 		if test x$enableval = xyes; then
-			xauth_pam=true
+			pkcs11=true
 		 else
-			xauth_pam=false
+			pkcs11=false
 		fi
 else
-  xauth_pam=false
-		xauth_pam_given=false
+  pkcs11=false
+		pkcs11_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" pkcs11"
 
-# Check whether --enable-xauth-noauth was given.
-if test "${enable_xauth_noauth+set}" = set; then :
-  enableval=$enable_xauth_noauth; xauth_noauth_given=true
+# Check whether --enable-revocation was given.
+if test "${enable_revocation+set}" = set; then :
+  enableval=$enable_revocation; revocation_given=true
 		if test x$enableval = xyes; then
-			xauth_noauth=true
+			revocation=true
 		 else
-			xauth_noauth=false
+			revocation=false
 		fi
 else
-  xauth_noauth=false
-		xauth_noauth_given=false
+  revocation=true
+		revocation_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" revocation"
 
-# Check whether --enable-tnc-ifmap was given.
-if test "${enable_tnc_ifmap+set}" = set; then :
-  enableval=$enable_tnc_ifmap; tnc_ifmap_given=true
+# Check whether --enable-whitelist was given.
+if test "${enable_whitelist+set}" = set; then :
+  enableval=$enable_whitelist; whitelist_given=true
 		if test x$enableval = xyes; then
-			tnc_ifmap=true
+			whitelist=true
 		 else
-			tnc_ifmap=false
+			whitelist=false
 		fi
 else
-  tnc_ifmap=false
-		tnc_ifmap_given=false
+  whitelist=false
+		whitelist_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" whitelist"
 
-# Check whether --enable-tnc-pdp was given.
-if test "${enable_tnc_pdp+set}" = set; then :
-  enableval=$enable_tnc_pdp; tnc_pdp_given=true
+# Check whether --enable-xauth-generic was given.
+if test "${enable_xauth_generic+set}" = set; then :
+  enableval=$enable_xauth_generic; xauth_generic_given=true
 		if test x$enableval = xyes; then
-			tnc_pdp=true
+			xauth_generic=true
 		 else
-			tnc_pdp=false
+			xauth_generic=false
 		fi
 else
-  tnc_pdp=false
-		tnc_pdp_given=false
+  xauth_generic=true
+		xauth_generic_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" xauth_generic"
 
-# Check whether --enable-tnc-imc was given.
-if test "${enable_tnc_imc+set}" = set; then :
-  enableval=$enable_tnc_imc; tnc_imc_given=true
+# Check whether --enable-xauth-eap was given.
+if test "${enable_xauth_eap+set}" = set; then :
+  enableval=$enable_xauth_eap; xauth_eap_given=true
 		if test x$enableval = xyes; then
-			tnc_imc=true
+			xauth_eap=true
 		 else
-			tnc_imc=false
+			xauth_eap=false
 		fi
 else
-  tnc_imc=false
-		tnc_imc_given=false
+  xauth_eap=false
+		xauth_eap_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" xauth_eap"
 
-# Check whether --enable-tnc-imv was given.
-if test "${enable_tnc_imv+set}" = set; then :
-  enableval=$enable_tnc_imv; tnc_imv_given=true
+# Check whether --enable-xauth-pam was given.
+if test "${enable_xauth_pam+set}" = set; then :
+  enableval=$enable_xauth_pam; xauth_pam_given=true
 		if test x$enableval = xyes; then
-			tnc_imv=true
+			xauth_pam=true
 		 else
-			tnc_imv=false
+			xauth_pam=false
 		fi
 else
-  tnc_imv=false
-		tnc_imv_given=false
+  xauth_pam=false
+		xauth_pam_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" xauth_pam"
 
-# Check whether --enable-tnccs-11 was given.
-if test "${enable_tnccs_11+set}" = set; then :
-  enableval=$enable_tnccs_11; tnccs_11_given=true
+# Check whether --enable-xauth-noauth was given.
+if test "${enable_xauth_noauth+set}" = set; then :
+  enableval=$enable_xauth_noauth; xauth_noauth_given=true
 		if test x$enableval = xyes; then
-			tnccs_11=true
+			xauth_noauth=true
 		 else
-			tnccs_11=false
+			xauth_noauth=false
 		fi
 else
-  tnccs_11=false
-		tnccs_11_given=false
+  xauth_noauth=false
+		xauth_noauth_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" xauth_noauth"
 
-# Check whether --enable-tnccs-20 was given.
-if test "${enable_tnccs_20+set}" = set; then :
-  enableval=$enable_tnccs_20; tnccs_20_given=true
+# kernel interfaces / sockets
+# Check whether --enable-kernel-netlink was given.
+if test "${enable_kernel_netlink+set}" = set; then :
+  enableval=$enable_kernel_netlink; kernel_netlink_given=true
 		if test x$enableval = xyes; then
-			tnccs_20=true
+			kernel_netlink=true
 		 else
-			tnccs_20=false
+			kernel_netlink=false
 		fi
 else
-  tnccs_20=false
-		tnccs_20_given=false
+  kernel_netlink=true
+		kernel_netlink_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" kernel_netlink"
 
-# Check whether --enable-tnccs-dynamic was given.
-if test "${enable_tnccs_dynamic+set}" = set; then :
-  enableval=$enable_tnccs_dynamic; tnccs_dynamic_given=true
+# Check whether --enable-kernel-pfkey was given.
+if test "${enable_kernel_pfkey+set}" = set; then :
+  enableval=$enable_kernel_pfkey; kernel_pfkey_given=true
 		if test x$enableval = xyes; then
-			tnccs_dynamic=true
+			kernel_pfkey=true
 		 else
-			tnccs_dynamic=false
+			kernel_pfkey=false
 		fi
 else
-  tnccs_dynamic=false
-		tnccs_dynamic_given=false
+  kernel_pfkey=false
+		kernel_pfkey_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" kernel_pfkey"
 
-# Check whether --enable-imc-test was given.
-if test "${enable_imc_test+set}" = set; then :
-  enableval=$enable_imc_test; imc_test_given=true
+# Check whether --enable-kernel-pfroute was given.
+if test "${enable_kernel_pfroute+set}" = set; then :
+  enableval=$enable_kernel_pfroute; kernel_pfroute_given=true
 		if test x$enableval = xyes; then
-			imc_test=true
+			kernel_pfroute=true
 		 else
-			imc_test=false
+			kernel_pfroute=false
 		fi
 else
-  imc_test=false
-		imc_test_given=false
+  kernel_pfroute=false
+		kernel_pfroute_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" kernel_pfroute"
 
-# Check whether --enable-imv-test was given.
-if test "${enable_imv_test+set}" = set; then :
-  enableval=$enable_imv_test; imv_test_given=true
+# Check whether --enable-kernel-klips was given.
+if test "${enable_kernel_klips+set}" = set; then :
+  enableval=$enable_kernel_klips; kernel_klips_given=true
 		if test x$enableval = xyes; then
-			imv_test=true
+			kernel_klips=true
 		 else
-			imv_test=false
+			kernel_klips=false
 		fi
 else
-  imv_test=false
-		imv_test_given=false
+  kernel_klips=false
+		kernel_klips_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" kernel_klips"
 
-# Check whether --enable-imc-scanner was given.
-if test "${enable_imc_scanner+set}" = set; then :
-  enableval=$enable_imc_scanner; imc_scanner_given=true
+# Check whether --enable-kernel-libipsec was given.
+if test "${enable_kernel_libipsec+set}" = set; then :
+  enableval=$enable_kernel_libipsec; kernel_libipsec_given=true
 		if test x$enableval = xyes; then
-			imc_scanner=true
+			kernel_libipsec=true
 		 else
-			imc_scanner=false
+			kernel_libipsec=false
 		fi
 else
-  imc_scanner=false
-		imc_scanner_given=false
+  kernel_libipsec=false
+		kernel_libipsec_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" kernel_libipsec"
 
-# Check whether --enable-imv-scanner was given.
-if test "${enable_imv_scanner+set}" = set; then :
-  enableval=$enable_imv_scanner; imv_scanner_given=true
+# 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
-			imv_scanner=true
+			socket_default=true
 		 else
-			imv_scanner=false
+			socket_default=false
 		fi
 else
-  imv_scanner=false
-		imv_scanner_given=false
+  socket_default=true
+		socket_default_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" socket_default"
 
-# Check whether --enable-imc-os was given.
-if test "${enable_imc_os+set}" = set; then :
-  enableval=$enable_imc_os; imc_os_given=true
+# 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
-			imc_os=true
+			socket_dynamic=true
 		 else
-			imc_os=false
+			socket_dynamic=false
 		fi
 else
-  imc_os=false
-		imc_os_given=false
+  socket_dynamic=false
+		socket_dynamic_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" socket_dynamic"
 
-# Check whether --enable-imv-os was given.
-if test "${enable_imv_os+set}" = set; then :
-  enableval=$enable_imv_os; imv_os_given=true
+# configuration/control plugins
+# Check whether --enable-stroke was given.
+if test "${enable_stroke+set}" = set; then :
+  enableval=$enable_stroke; stroke_given=true
 		if test x$enableval = xyes; then
-			imv_os=true
+			stroke=true
 		 else
-			imv_os=false
+			stroke=false
 		fi
 else
-  imv_os=false
-		imv_os_given=false
+  stroke=true
+		stroke_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" stroke"
 
-# Check whether --enable-imc-attestation was given.
-if test "${enable_imc_attestation+set}" = set; then :
-  enableval=$enable_imc_attestation; imc_attestation_given=true
+# Check whether --enable-smp was given.
+if test "${enable_smp+set}" = set; then :
+  enableval=$enable_smp; smp_given=true
 		if test x$enableval = xyes; then
-			imc_attestation=true
+			smp=true
 		 else
-			imc_attestation=false
+			smp=false
 		fi
 else
-  imc_attestation=false
-		imc_attestation_given=false
+  smp=false
+		smp_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" smp"
 
-# Check whether --enable-imv-attestation was given.
-if test "${enable_imv_attestation+set}" = set; then :
-  enableval=$enable_imv_attestation; imv_attestation_given=true
+# Check whether --enable-sql was given.
+if test "${enable_sql+set}" = set; then :
+  enableval=$enable_sql; sql_given=true
 		if test x$enableval = xyes; then
-			imv_attestation=true
+			sql=true
 		 else
-			imv_attestation=false
+			sql=false
 		fi
 else
-  imv_attestation=false
-		imv_attestation_given=false
+  sql=false
+		sql_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" sql"
 
-# Check whether --enable-imc-swid was given.
-if test "${enable_imc_swid+set}" = set; then :
-  enableval=$enable_imc_swid; imc_swid_given=true
+# Check whether --enable-uci was given.
+if test "${enable_uci+set}" = set; then :
+  enableval=$enable_uci; uci_given=true
 		if test x$enableval = xyes; then
-			imc_swid=true
+			uci=true
 		 else
-			imc_swid=false
+			uci=false
 		fi
 else
-  imc_swid=false
-		imc_swid_given=false
+  uci=false
+		uci_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" uci"
 
-# Check whether --enable-imv-swid was given.
-if test "${enable_imv_swid+set}" = set; then :
-  enableval=$enable_imv_swid; imv_swid_given=true
+# attribute provider/consumer plugins
+# Check whether --enable-android-dns was given.
+if test "${enable_android_dns+set}" = set; then :
+  enableval=$enable_android_dns; android_dns_given=true
 		if test x$enableval = xyes; then
-			imv_swid=true
+			android_dns=true
 		 else
-			imv_swid=false
+			android_dns=false
 		fi
 else
-  imv_swid=false
-		imv_swid_given=false
+  android_dns=false
+		android_dns_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" android_dns"
 
-# Check whether --enable-kernel-netlink was given.
-if test "${enable_kernel_netlink+set}" = set; then :
-  enableval=$enable_kernel_netlink; kernel_netlink_given=true
+# Check whether --enable-attr was given.
+if test "${enable_attr+set}" = set; then :
+  enableval=$enable_attr; attr_given=true
 		if test x$enableval = xyes; then
-			kernel_netlink=true
+			attr=true
 		 else
-			kernel_netlink=false
+			attr=false
 		fi
 else
-  kernel_netlink=true
-		kernel_netlink_given=false
+  attr=true
+		attr_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" kernel_netlink"
+	enabled_by_default=${enabled_by_default}" attr"
 
-# Check whether --enable-kernel-pfkey was given.
-if test "${enable_kernel_pfkey+set}" = set; then :
-  enableval=$enable_kernel_pfkey; kernel_pfkey_given=true
+# Check whether --enable-attr-sql was given.
+if test "${enable_attr_sql+set}" = set; then :
+  enableval=$enable_attr_sql; attr_sql_given=true
 		if test x$enableval = xyes; then
-			kernel_pfkey=true
+			attr_sql=true
 		 else
-			kernel_pfkey=false
+			attr_sql=false
 		fi
 else
-  kernel_pfkey=false
-		kernel_pfkey_given=false
+  attr_sql=false
+		attr_sql_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" attr_sql"
 
-# Check whether --enable-kernel-pfroute was given.
-if test "${enable_kernel_pfroute+set}" = set; then :
-  enableval=$enable_kernel_pfroute; kernel_pfroute_given=true
+# 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
-			kernel_pfroute=true
+			dhcp=true
 		 else
-			kernel_pfroute=false
+			dhcp=false
 		fi
 else
-  kernel_pfroute=false
-		kernel_pfroute_given=false
+  dhcp=false
+		dhcp_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" dhcp"
 
-# Check whether --enable-kernel-klips was given.
-if test "${enable_kernel_klips+set}" = set; then :
-  enableval=$enable_kernel_klips; kernel_klips_given=true
+# Check whether --enable-osx-attr was given.
+if test "${enable_osx_attr+set}" = set; then :
+  enableval=$enable_osx_attr; osx_attr_given=true
 		if test x$enableval = xyes; then
-			kernel_klips=true
+			osx_attr=true
 		 else
-			kernel_klips=false
+			osx_attr=false
 		fi
 else
-  kernel_klips=false
-		kernel_klips_given=false
+  osx_attr=false
+		osx_attr_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" osx_attr"
 
-# Check whether --enable-kernel-libipsec was given.
-if test "${enable_kernel_libipsec+set}" = set; then :
-  enableval=$enable_kernel_libipsec; kernel_libipsec_given=true
+# Check whether --enable-resolve was given.
+if test "${enable_resolve+set}" = set; then :
+  enableval=$enable_resolve; resolve_given=true
 		if test x$enableval = xyes; then
-			kernel_libipsec=true
+			resolve=true
 		 else
-			kernel_libipsec=false
+			resolve=false
 		fi
 else
-  kernel_libipsec=false
-		kernel_libipsec_given=false
+  resolve=true
+		resolve_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" resolve"
 
-# Check whether --enable-libipsec was given.
-if test "${enable_libipsec+set}" = set; then :
-  enableval=$enable_libipsec; libipsec_given=true
+# Check whether --enable-unity was given.
+if test "${enable_unity+set}" = set; then :
+  enableval=$enable_unity; unity_given=true
 		if test x$enableval = xyes; then
-			libipsec=true
+			unity=true
 		 else
-			libipsec=false
+			unity=false
 		fi
 else
-  libipsec=false
-		libipsec_given=false
+  unity=false
+		unity_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" unity"
 
-# Check whether --enable-socket-default was given.
-if test "${enable_socket_default+set}" = set; then :
-  enableval=$enable_socket_default; socket_default_given=true
+# TNC modules/plugins
+# Check whether --enable-imc-test was given.
+if test "${enable_imc_test+set}" = set; then :
+  enableval=$enable_imc_test; imc_test_given=true
 		if test x$enableval = xyes; then
-			socket_default=true
+			imc_test=true
 		 else
-			socket_default=false
+			imc_test=false
 		fi
 else
-  socket_default=true
-		socket_default_given=false
+  imc_test=false
+		imc_test_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" socket_default"
+	disabled_by_default=${disabled_by_default}" imc_test"
 
-# Check whether --enable-socket-dynamic was given.
-if test "${enable_socket_dynamic+set}" = set; then :
-  enableval=$enable_socket_dynamic; socket_dynamic_given=true
+# Check whether --enable-imv-test was given.
+if test "${enable_imv_test+set}" = set; then :
+  enableval=$enable_imv_test; imv_test_given=true
 		if test x$enableval = xyes; then
-			socket_dynamic=true
+			imv_test=true
 		 else
-			socket_dynamic=false
+			imv_test=false
 		fi
 else
-  socket_dynamic=false
-		socket_dynamic_given=false
+  imv_test=false
+		imv_test_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" imv_test"
 
-# Check whether --enable-farp was given.
-if test "${enable_farp+set}" = set; then :
-  enableval=$enable_farp; farp_given=true
+# Check whether --enable-imc-scanner was given.
+if test "${enable_imc_scanner+set}" = set; then :
+  enableval=$enable_imc_scanner; imc_scanner_given=true
 		if test x$enableval = xyes; then
-			farp=true
+			imc_scanner=true
 		 else
-			farp=false
+			imc_scanner=false
 		fi
 else
-  farp=false
-		farp_given=false
+  imc_scanner=false
+		imc_scanner_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" imc_scanner"
 
-# Check whether --enable-dumm was given.
-if test "${enable_dumm+set}" = set; then :
-  enableval=$enable_dumm; dumm_given=true
+# Check whether --enable-imv-scanner was given.
+if test "${enable_imv_scanner+set}" = set; then :
+  enableval=$enable_imv_scanner; imv_scanner_given=true
 		if test x$enableval = xyes; then
-			dumm=true
+			imv_scanner=true
 		 else
-			dumm=false
+			imv_scanner=false
 		fi
 else
-  dumm=false
-		dumm_given=false
+  imv_scanner=false
+		imv_scanner_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" imv_scanner"
 
-# Check whether --enable-fast was given.
-if test "${enable_fast+set}" = set; then :
-  enableval=$enable_fast; fast_given=true
+# Check whether --enable-imc-os was given.
+if test "${enable_imc_os+set}" = set; then :
+  enableval=$enable_imc_os; imc_os_given=true
 		if test x$enableval = xyes; then
-			fast=true
+			imc_os=true
 		 else
-			fast=false
+			imc_os=false
 		fi
 else
-  fast=false
-		fast_given=false
+  imc_os=false
+		imc_os_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" imc_os"
 
-# Check whether --enable-manager was given.
-if test "${enable_manager+set}" = set; then :
-  enableval=$enable_manager; manager_given=true
+# Check whether --enable-imv-os was given.
+if test "${enable_imv_os+set}" = set; then :
+  enableval=$enable_imv_os; imv_os_given=true
 		if test x$enableval = xyes; then
-			manager=true
+			imv_os=true
 		 else
-			manager=false
+			imv_os=false
 		fi
 else
-  manager=false
-		manager_given=false
+  imv_os=false
+		imv_os_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" imv_os"
 
-# Check whether --enable-mediation was given.
-if test "${enable_mediation+set}" = set; then :
-  enableval=$enable_mediation; mediation_given=true
+# Check whether --enable-imc-attestation was given.
+if test "${enable_imc_attestation+set}" = set; then :
+  enableval=$enable_imc_attestation; imc_attestation_given=true
 		if test x$enableval = xyes; then
-			mediation=true
+			imc_attestation=true
 		 else
-			mediation=false
+			imc_attestation=false
 		fi
 else
-  mediation=false
-		mediation_given=false
+  imc_attestation=false
+		imc_attestation_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" imc_attestation"
 
-# Check whether --enable-integrity-test was given.
-if test "${enable_integrity_test+set}" = set; then :
-  enableval=$enable_integrity_test; integrity_test_given=true
+# Check whether --enable-imv-attestation was given.
+if test "${enable_imv_attestation+set}" = set; then :
+  enableval=$enable_imv_attestation; imv_attestation_given=true
 		if test x$enableval = xyes; then
-			integrity_test=true
+			imv_attestation=true
 		 else
-			integrity_test=false
+			imv_attestation=false
 		fi
 else
-  integrity_test=false
-		integrity_test_given=false
+  imv_attestation=false
+		imv_attestation_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" imv_attestation"
 
-# Check whether --enable-load-warning was given.
-if test "${enable_load_warning+set}" = set; then :
-  enableval=$enable_load_warning; load_warning_given=true
+# Check whether --enable-imc-swid was given.
+if test "${enable_imc_swid+set}" = set; then :
+  enableval=$enable_imc_swid; imc_swid_given=true
 		if test x$enableval = xyes; then
-			load_warning=true
+			imc_swid=true
 		 else
-			load_warning=false
+			imc_swid=false
 		fi
 else
-  load_warning=true
-		load_warning_given=false
+  imc_swid=false
+		imc_swid_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" load_warning"
+	disabled_by_default=${disabled_by_default}" imc_swid"
 
-# Check whether --enable-ikev1 was given.
-if test "${enable_ikev1+set}" = set; then :
-  enableval=$enable_ikev1; ikev1_given=true
+# Check whether --enable-imv-swid was given.
+if test "${enable_imv_swid+set}" = set; then :
+  enableval=$enable_imv_swid; imv_swid_given=true
 		if test x$enableval = xyes; then
-			ikev1=true
+			imv_swid=true
 		 else
-			ikev1=false
+			imv_swid=false
 		fi
 else
-  ikev1=true
-		ikev1_given=false
+  imv_swid=false
+		imv_swid_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" ikev1"
+	disabled_by_default=${disabled_by_default}" imv_swid"
 
-# Check whether --enable-ikev2 was given.
-if test "${enable_ikev2+set}" = set; then :
-  enableval=$enable_ikev2; ikev2_given=true
+# Check whether --enable-tnc-ifmap was given.
+if test "${enable_tnc_ifmap+set}" = set; then :
+  enableval=$enable_tnc_ifmap; tnc_ifmap_given=true
 		if test x$enableval = xyes; then
-			ikev2=true
+			tnc_ifmap=true
 		 else
-			ikev2=false
+			tnc_ifmap=false
 		fi
 else
-  ikev2=true
-		ikev2_given=false
+  tnc_ifmap=false
+		tnc_ifmap_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" ikev2"
+	disabled_by_default=${disabled_by_default}" tnc_ifmap"
 
-# Check whether --enable-charon was given.
-if test "${enable_charon+set}" = set; then :
-  enableval=$enable_charon; charon_given=true
+# Check whether --enable-tnc-imc was given.
+if test "${enable_tnc_imc+set}" = set; then :
+  enableval=$enable_tnc_imc; tnc_imc_given=true
 		if test x$enableval = xyes; then
-			charon=true
+			tnc_imc=true
 		 else
-			charon=false
+			tnc_imc=false
 		fi
 else
-  charon=true
-		charon_given=false
+  tnc_imc=false
+		tnc_imc_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" charon"
+	disabled_by_default=${disabled_by_default}" tnc_imc"
 
-# Check whether --enable-tools was given.
-if test "${enable_tools+set}" = set; then :
-  enableval=$enable_tools; tools_given=true
+# Check whether --enable-tnc-imv was given.
+if test "${enable_tnc_imv+set}" = set; then :
+  enableval=$enable_tnc_imv; tnc_imv_given=true
 		if test x$enableval = xyes; then
-			tools=true
+			tnc_imv=true
 		 else
-			tools=false
+			tnc_imv=false
 		fi
 else
-  tools=true
-		tools_given=false
+  tnc_imv=false
+		tnc_imv_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" tools"
+	disabled_by_default=${disabled_by_default}" tnc_imv"
 
-# Check whether --enable-scripts was given.
-if test "${enable_scripts+set}" = set; then :
-  enableval=$enable_scripts; scripts_given=true
+# Check whether --enable-tnc-pdp was given.
+if test "${enable_tnc_pdp+set}" = set; then :
+  enableval=$enable_tnc_pdp; tnc_pdp_given=true
 		if test x$enableval = xyes; then
-			scripts=true
+			tnc_pdp=true
 		 else
-			scripts=false
+			tnc_pdp=false
 		fi
 else
-  scripts=true
-		scripts_given=false
+  tnc_pdp=false
+		tnc_pdp_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" scripts"
+	disabled_by_default=${disabled_by_default}" tnc_pdp"
 
-# Check whether --enable-conftest was given.
-if test "${enable_conftest+set}" = set; then :
-  enableval=$enable_conftest; conftest_given=true
+# Check whether --enable-tnccs-11 was given.
+if test "${enable_tnccs_11+set}" = set; then :
+  enableval=$enable_tnccs_11; tnccs_11_given=true
 		if test x$enableval = xyes; then
-			conftest=true
+			tnccs_11=true
 		 else
-			conftest=false
+			tnccs_11=false
 		fi
 else
-  conftest=false
-		conftest_given=false
+  tnccs_11=false
+		tnccs_11_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" tnccs_11"
 
-# Check whether --enable-updown was given.
-if test "${enable_updown+set}" = set; then :
-  enableval=$enable_updown; updown_given=true
+# Check whether --enable-tnccs-20 was given.
+if test "${enable_tnccs_20+set}" = set; then :
+  enableval=$enable_tnccs_20; tnccs_20_given=true
 		if test x$enableval = xyes; then
-			updown=true
+			tnccs_20=true
 		 else
-			updown=false
+			tnccs_20=false
 		fi
 else
-  updown=true
-		updown_given=false
+  tnccs_20=false
+		tnccs_20_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" updown"
+	disabled_by_default=${disabled_by_default}" tnccs_20"
 
-# Check whether --enable-attr was given.
-if test "${enable_attr+set}" = set; then :
-  enableval=$enable_attr; attr_given=true
+# Check whether --enable-tnccs-dynamic was given.
+if test "${enable_tnccs_dynamic+set}" = set; then :
+  enableval=$enable_tnccs_dynamic; tnccs_dynamic_given=true
 		if test x$enableval = xyes; then
-			attr=true
+			tnccs_dynamic=true
 		 else
-			attr=false
+			tnccs_dynamic=false
 		fi
 else
-  attr=true
-		attr_given=false
+  tnccs_dynamic=false
+		tnccs_dynamic_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" attr"
+	disabled_by_default=${disabled_by_default}" tnccs_dynamic"
 
-# Check whether --enable-attr-sql was given.
-if test "${enable_attr_sql+set}" = set; then :
-  enableval=$enable_attr_sql; attr_sql_given=true
+# misc plugins
+# Check whether --enable-android-log was given.
+if test "${enable_android_log+set}" = set; then :
+  enableval=$enable_android_log; android_log_given=true
 		if test x$enableval = xyes; then
-			attr_sql=true
+			android_log=true
 		 else
-			attr_sql=false
+			android_log=false
 		fi
 else
-  attr_sql=false
-		attr_sql_given=false
+  android_log=false
+		android_log_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" android_log"
 
-# Check whether --enable-dhcp was given.
-if test "${enable_dhcp+set}" = set; then :
-  enableval=$enable_dhcp; dhcp_given=true
+# Check whether --enable-certexpire was given.
+if test "${enable_certexpire+set}" = set; then :
+  enableval=$enable_certexpire; certexpire_given=true
 		if test x$enableval = xyes; then
-			dhcp=true
+			certexpire=true
 		 else
-			dhcp=false
+			certexpire=false
 		fi
 else
-  dhcp=false
-		dhcp_given=false
+  certexpire=false
+		certexpire_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" certexpire"
 
-# Check whether --enable-resolve was given.
-if test "${enable_resolve+set}" = set; then :
-  enableval=$enable_resolve; resolve_given=true
+# Check whether --enable-duplicheck was given.
+if test "${enable_duplicheck+set}" = set; then :
+  enableval=$enable_duplicheck; duplicheck_given=true
 		if test x$enableval = xyes; then
-			resolve=true
+			duplicheck=true
 		 else
-			resolve=false
+			duplicheck=false
 		fi
 else
-  resolve=true
-		resolve_given=false
+  duplicheck=false
+		duplicheck_given=false
 
 fi
 
-	enabled_by_default=${enabled_by_default}" resolve"
+	disabled_by_default=${disabled_by_default}" duplicheck"
 
-# Check whether --enable-padlock was given.
-if test "${enable_padlock+set}" = set; then :
-  enableval=$enable_padlock; padlock_given=true
+# Check whether --enable-error-notify was given.
+if test "${enable_error_notify+set}" = set; then :
+  enableval=$enable_error_notify; error_notify_given=true
 		if test x$enableval = xyes; then
-			padlock=true
+			error_notify=true
 		 else
-			padlock=false
+			error_notify=false
 		fi
 else
-  padlock=false
-		padlock_given=false
+  error_notify=false
+		error_notify_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" error_notify"
 
-# Check whether --enable-openssl was given.
-if test "${enable_openssl+set}" = set; then :
-  enableval=$enable_openssl; openssl_given=true
+# 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
-			openssl=true
+			farp=true
 		 else
-			openssl=false
+			farp=false
 		fi
 else
-  openssl=false
-		openssl_given=false
+  farp=false
+		farp_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" farp"
 
-# Check whether --enable-gcrypt was given.
-if test "${enable_gcrypt+set}" = set; then :
-  enableval=$enable_gcrypt; gcrypt_given=true
+# 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
-			gcrypt=true
+			ha=true
 		 else
-			gcrypt=false
+			ha=false
 		fi
 else
-  gcrypt=false
-		gcrypt_given=false
+  ha=false
+		ha_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" ha"
 
-# Check whether --enable-agent was given.
-if test "${enable_agent+set}" = set; then :
-  enableval=$enable_agent; agent_given=true
+# Check whether --enable-led was given.
+if test "${enable_led+set}" = set; then :
+  enableval=$enable_led; led_given=true
 		if test x$enableval = xyes; then
-			agent=true
+			led=true
 		 else
-			agent=false
+			led=false
 		fi
 else
-  agent=false
-		agent_given=false
+  led=false
+		led_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" led"
 
-# Check whether --enable-keychain was given.
-if test "${enable_keychain+set}" = set; then :
-  enableval=$enable_keychain; keychain_given=true
+# Check whether --enable-load-tester was given.
+if test "${enable_load_tester+set}" = set; then :
+  enableval=$enable_load_tester; load_tester_given=true
 		if test x$enableval = xyes; then
-			keychain=true
+			load_tester=true
 		 else
-			keychain=false
+			load_tester=false
 		fi
 else
-  keychain=false
-		keychain_given=false
+  load_tester=false
+		load_tester_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" load_tester"
 
-# Check whether --enable-pkcs11 was given.
-if test "${enable_pkcs11+set}" = set; then :
-  enableval=$enable_pkcs11; pkcs11_given=true
+# Check whether --enable-lookip was given.
+if test "${enable_lookip+set}" = set; then :
+  enableval=$enable_lookip; lookip_given=true
 		if test x$enableval = xyes; then
-			pkcs11=true
+			lookip=true
 		 else
-			pkcs11=false
+			lookip=false
 		fi
 else
-  pkcs11=false
-		pkcs11_given=false
+  lookip=false
+		lookip_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" lookip"
 
-# Check whether --enable-ctr was given.
-if test "${enable_ctr+set}" = set; then :
-  enableval=$enable_ctr; ctr_given=true
+# Check whether --enable-maemo was given.
+if test "${enable_maemo+set}" = set; then :
+  enableval=$enable_maemo; maemo_given=true
 		if test x$enableval = xyes; then
-			ctr=true
+			maemo=true
 		 else
-			ctr=false
+			maemo=false
 		fi
 else
-  ctr=false
-		ctr_given=false
+  maemo=false
+		maemo_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" maemo"
 
-# Check whether --enable-ccm was given.
-if test "${enable_ccm+set}" = set; then :
-  enableval=$enable_ccm; ccm_given=true
+# Check whether --enable-radattr was given.
+if test "${enable_radattr+set}" = set; then :
+  enableval=$enable_radattr; radattr_given=true
 		if test x$enableval = xyes; then
-			ccm=true
+			radattr=true
 		 else
-			ccm=false
+			radattr=false
 		fi
 else
-  ccm=false
-		ccm_given=false
+  radattr=false
+		radattr_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" radattr"
 
-# Check whether --enable-gcm was given.
-if test "${enable_gcm+set}" = set; then :
-  enableval=$enable_gcm; gcm_given=true
+# Check whether --enable-systime-fix was given.
+if test "${enable_systime_fix+set}" = set; then :
+  enableval=$enable_systime_fix; systime_fix_given=true
 		if test x$enableval = xyes; then
-			gcm=true
+			systime_fix=true
 		 else
-			gcm=false
+			systime_fix=false
 		fi
 else
-  gcm=false
-		gcm_given=false
+  systime_fix=false
+		systime_fix_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" systime_fix"
 
-# Check whether --enable-ntru was given.
-if test "${enable_ntru+set}" = set; then :
-  enableval=$enable_ntru; ntru_given=true
+# Check whether --enable-test-vectors was given.
+if test "${enable_test_vectors+set}" = set; then :
+  enableval=$enable_test_vectors; test_vectors_given=true
 		if test x$enableval = xyes; then
-			ntru=true
+			test_vectors=true
 		 else
-			ntru=false
+			test_vectors=false
 		fi
 else
-  ntru=false
-		ntru_given=false
+  test_vectors=false
+		test_vectors_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" test_vectors"
 
-# Check whether --enable-addrblock was given.
-if test "${enable_addrblock+set}" = set; then :
-  enableval=$enable_addrblock; addrblock_given=true
+# Check whether --enable-unit-tester was given.
+if test "${enable_unit_tester+set}" = set; then :
+  enableval=$enable_unit_tester; unit_tester_given=true
 		if test x$enableval = xyes; then
-			addrblock=true
+			unit_tester=true
 		 else
-			addrblock=false
+			unit_tester=false
 		fi
 else
-  addrblock=false
-		addrblock_given=false
+  unit_tester=false
+		unit_tester_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" unit_tester"
 
-# Check whether --enable-unity was given.
-if test "${enable_unity+set}" = set; then :
-  enableval=$enable_unity; unity_given=true
+# Check whether --enable-updown was given.
+if test "${enable_updown+set}" = set; then :
+  enableval=$enable_updown; updown_given=true
 		if test x$enableval = xyes; then
-			unity=true
+			updown=true
 		 else
-			unity=false
+			updown=false
 		fi
 else
-  unity=false
-		unity_given=false
+  updown=true
+		updown_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" updown"
 
-# Check whether --enable-uci was given.
-if test "${enable_uci+set}" = set; then :
-  enableval=$enable_uci; uci_given=true
+# programs/components
+# Check whether --enable-charon was given.
+if test "${enable_charon+set}" = set; then :
+  enableval=$enable_charon; charon_given=true
 		if test x$enableval = xyes; then
-			uci=true
+			charon=true
 		 else
-			uci=false
+			charon=false
 		fi
 else
-  uci=false
-		uci_given=false
+  charon=true
+		charon_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" charon"
 
-# Check whether --enable-osx-attr was given.
-if test "${enable_osx_attr+set}" = set; then :
-  enableval=$enable_osx_attr; osx_attr_given=true
+# Check whether --enable-cmd was given.
+if test "${enable_cmd+set}" = set; then :
+  enableval=$enable_cmd; cmd_given=true
 		if test x$enableval = xyes; then
-			osx_attr=true
+			cmd=true
 		 else
-			osx_attr=false
+			cmd=false
 		fi
 else
-  osx_attr=false
-		osx_attr_given=false
+  cmd=false
+		cmd_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" cmd"
 
-# Check whether --enable-android-dns was given.
-if test "${enable_android_dns+set}" = set; then :
-  enableval=$enable_android_dns; android_dns_given=true
+# Check whether --enable-conftest was given.
+if test "${enable_conftest+set}" = set; then :
+  enableval=$enable_conftest; conftest_given=true
 		if test x$enableval = xyes; then
-			android_dns=true
+			conftest=true
 		 else
-			android_dns=false
+			conftest=false
 		fi
 else
-  android_dns=false
-		android_dns_given=false
+  conftest=false
+		conftest_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" conftest"
 
-# Check whether --enable-android-log was given.
-if test "${enable_android_log+set}" = set; then :
-  enableval=$enable_android_log; android_log_given=true
+# Check whether --enable-dumm was given.
+if test "${enable_dumm+set}" = set; then :
+  enableval=$enable_dumm; dumm_given=true
 		if test x$enableval = xyes; then
-			android_log=true
+			dumm=true
 		 else
-			android_log=false
+			dumm=false
 		fi
 else
-  android_log=false
-		android_log_given=false
+  dumm=false
+		dumm_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" dumm"
 
-# Check whether --enable-maemo was given.
-if test "${enable_maemo+set}" = set; then :
-  enableval=$enable_maemo; maemo_given=true
+# Check whether --enable-fast was given.
+if test "${enable_fast+set}" = set; then :
+  enableval=$enable_fast; fast_given=true
 		if test x$enableval = xyes; then
-			maemo=true
+			fast=true
 		 else
-			maemo=false
+			fast=false
 		fi
 else
-  maemo=false
-		maemo_given=false
+  fast=false
+		fast_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" fast"
 
-# Check whether --enable-nm was given.
-if test "${enable_nm+set}" = set; then :
-  enableval=$enable_nm; nm_given=true
+# Check whether --enable-libipsec was given.
+if test "${enable_libipsec+set}" = set; then :
+  enableval=$enable_libipsec; libipsec_given=true
 		if test x$enableval = xyes; then
-			nm=true
+			libipsec=true
 		 else
-			nm=false
+			libipsec=false
 		fi
 else
-  nm=false
-		nm_given=false
+  libipsec=false
+		libipsec_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" libipsec"
 
-# Check whether --enable-ha was given.
-if test "${enable_ha+set}" = set; then :
-  enableval=$enable_ha; ha_given=true
+# Check whether --enable-manager was given.
+if test "${enable_manager+set}" = set; then :
+  enableval=$enable_manager; manager_given=true
 		if test x$enableval = xyes; then
-			ha=true
+			manager=true
 		 else
-			ha=false
+			manager=false
 		fi
 else
-  ha=false
-		ha_given=false
+  manager=false
+		manager_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" manager"
 
-# Check whether --enable-whitelist was given.
-if test "${enable_whitelist+set}" = set; then :
-  enableval=$enable_whitelist; whitelist_given=true
+# Check whether --enable-medcli was given.
+if test "${enable_medcli+set}" = set; then :
+  enableval=$enable_medcli; medcli_given=true
 		if test x$enableval = xyes; then
-			whitelist=true
+			medcli=true
 		 else
-			whitelist=false
+			medcli=false
 		fi
 else
-  whitelist=false
-		whitelist_given=false
+  medcli=false
+		medcli_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" medcli"
 
-# Check whether --enable-lookip was given.
-if test "${enable_lookip+set}" = set; then :
-  enableval=$enable_lookip; lookip_given=true
+# Check whether --enable-medsrv was given.
+if test "${enable_medsrv+set}" = set; then :
+  enableval=$enable_medsrv; medsrv_given=true
 		if test x$enableval = xyes; then
-			lookip=true
+			medsrv=true
 		 else
-			lookip=false
+			medsrv=false
 		fi
 else
-  lookip=false
-		lookip_given=false
+  medsrv=false
+		medsrv_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" medsrv"
 
-# Check whether --enable-error-notify was given.
-if test "${enable_error_notify+set}" = set; then :
-  enableval=$enable_error_notify; error_notify_given=true
+# Check whether --enable-nm was given.
+if test "${enable_nm+set}" = set; then :
+  enableval=$enable_nm; nm_given=true
 		if test x$enableval = xyes; then
-			error_notify=true
+			nm=true
 		 else
-			error_notify=false
+			nm=false
 		fi
 else
-  error_notify=false
-		error_notify_given=false
+  nm=false
+		nm_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" nm"
 
-# Check whether --enable-certexpire was given.
-if test "${enable_certexpire+set}" = set; then :
-  enableval=$enable_certexpire; certexpire_given=true
+# Check whether --enable-scripts was given.
+if test "${enable_scripts+set}" = set; then :
+  enableval=$enable_scripts; scripts_given=true
 		if test x$enableval = xyes; then
-			certexpire=true
+			scripts=true
 		 else
-			certexpire=false
+			scripts=false
 		fi
 else
-  certexpire=false
-		certexpire_given=false
+  scripts=true
+		scripts_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" scripts"
 
-# Check whether --enable-systime-fix was given.
-if test "${enable_systime_fix+set}" = set; then :
-  enableval=$enable_systime_fix; systime_fix_given=true
+# Check whether --enable-tkm was given.
+if test "${enable_tkm+set}" = set; then :
+  enableval=$enable_tkm; tkm_given=true
 		if test x$enableval = xyes; then
-			systime_fix=true
+			tkm=true
 		 else
-			systime_fix=false
+			tkm=false
 		fi
 else
-  systime_fix=false
-		systime_fix_given=false
+  tkm=false
+		tkm_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" tkm"
 
-# Check whether --enable-led was given.
-if test "${enable_led+set}" = set; then :
-  enableval=$enable_led; led_given=true
+# Check whether --enable-tools was given.
+if test "${enable_tools+set}" = set; then :
+  enableval=$enable_tools; tools_given=true
 		if test x$enableval = xyes; then
-			led=true
+			tools=true
 		 else
-			led=false
+			tools=false
 		fi
 else
-  led=false
-		led_given=false
+  tools=true
+		tools_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" tools"
 
-# Check whether --enable-duplicheck was given.
-if test "${enable_duplicheck+set}" = set; then :
-  enableval=$enable_duplicheck; duplicheck_given=true
+# optional features
+# Check whether --enable-bfd-backtraces was given.
+if test "${enable_bfd_backtraces+set}" = set; then :
+  enableval=$enable_bfd_backtraces; bfd_backtraces_given=true
 		if test x$enableval = xyes; then
-			duplicheck=true
+			bfd_backtraces=true
 		 else
-			duplicheck=false
+			bfd_backtraces=false
 		fi
 else
-  duplicheck=false
-		duplicheck_given=false
+  bfd_backtraces=false
+		bfd_backtraces_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" bfd_backtraces"
 
-# Check whether --enable-coupling was given.
-if test "${enable_coupling+set}" = set; then :
-  enableval=$enable_coupling; coupling_given=true
+# Check whether --enable-ikev1 was given.
+if test "${enable_ikev1+set}" = set; then :
+  enableval=$enable_ikev1; ikev1_given=true
 		if test x$enableval = xyes; then
-			coupling=true
+			ikev1=true
 		 else
-			coupling=false
+			ikev1=false
 		fi
 else
-  coupling=false
-		coupling_given=false
+  ikev1=true
+		ikev1_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" ikev1"
 
-# Check whether --enable-radattr was given.
-if test "${enable_radattr+set}" = set; then :
-  enableval=$enable_radattr; radattr_given=true
+# Check whether --enable-ikev2 was given.
+if test "${enable_ikev2+set}" = set; then :
+  enableval=$enable_ikev2; ikev2_given=true
 		if test x$enableval = xyes; then
-			radattr=true
+			ikev2=true
 		 else
-			radattr=false
+			ikev2=false
 		fi
 else
-  radattr=false
-		radattr_given=false
+  ikev2=true
+		ikev2_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" ikev2"
 
-# Check whether --enable-vstr was given.
-if test "${enable_vstr+set}" = set; then :
-  enableval=$enable_vstr; vstr_given=true
+# Check whether --enable-integrity-test was given.
+if test "${enable_integrity_test+set}" = set; then :
+  enableval=$enable_integrity_test; integrity_test_given=true
 		if test x$enableval = xyes; then
-			vstr=true
+			integrity_test=true
 		 else
-			vstr=false
+			integrity_test=false
 		fi
 else
-  vstr=false
-		vstr_given=false
+  integrity_test=false
+		integrity_test_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" integrity_test"
 
-# Check whether --enable-monolithic was given.
-if test "${enable_monolithic+set}" = set; then :
-  enableval=$enable_monolithic; monolithic_given=true
+# Check whether --enable-load-warning was given.
+if test "${enable_load_warning+set}" = set; then :
+  enableval=$enable_load_warning; load_warning_given=true
 		if test x$enableval = xyes; then
-			monolithic=true
+			load_warning=true
 		 else
-			monolithic=false
+			load_warning=false
 		fi
 else
-  monolithic=false
-		monolithic_given=false
+  load_warning=true
+		load_warning_given=false
 
 fi
 
+	enabled_by_default=${enabled_by_default}" load_warning"
 
-# Check whether --enable-bfd-backtraces was given.
-if test "${enable_bfd_backtraces+set}" = set; then :
-  enableval=$enable_bfd_backtraces; bfd_backtraces_given=true
+# Check whether --enable-mediation was given.
+if test "${enable_mediation+set}" = set; then :
+  enableval=$enable_mediation; mediation_given=true
 		if test x$enableval = xyes; then
-			bfd_backtraces=true
+			mediation=true
 		 else
-			bfd_backtraces=false
+			mediation=false
 		fi
 else
-  bfd_backtraces=false
-		bfd_backtraces_given=false
+  mediation=false
+		mediation_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" mediation"
 
 # Check whether --enable-unwind-backtraces was given.
 if test "${enable_unwind_backtraces+set}" = set; then :
@@ -6740,7 +6859,9 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" unwind_backtraces"
 
+# compile options
 # Check whether --enable-coverage was given.
 if test "${enable_coverage+set}" = set; then :
   enableval=$enable_coverage; coverage_given=true
@@ -6755,36 +6876,55 @@ else
 
 fi
 
+	disabled_by_default=${disabled_by_default}" coverage"
 
-# Check whether --enable-tkm was given.
-if test "${enable_tkm+set}" = set; then :
-  enableval=$enable_tkm; tkm_given=true
+# Check whether --enable-leak-detective was given.
+if test "${enable_leak_detective+set}" = set; then :
+  enableval=$enable_leak_detective; leak_detective_given=true
 		if test x$enableval = xyes; then
-			tkm=true
+			leak_detective=true
 		 else
-			tkm=false
+			leak_detective=false
 		fi
 else
-  tkm=false
-		tkm_given=false
+  leak_detective=false
+		leak_detective_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" leak_detective"
 
-# Check whether --enable-cmd was given.
-if test "${enable_cmd+set}" = set; then :
-  enableval=$enable_cmd; cmd_given=true
+# Check whether --enable-lock-profiler was given.
+if test "${enable_lock_profiler+set}" = set; then :
+  enableval=$enable_lock_profiler; lock_profiler_given=true
 		if test x$enableval = xyes; then
-			cmd=true
+			lock_profiler=true
 		 else
-			cmd=false
+			lock_profiler=false
 		fi
 else
-  cmd=false
-		cmd_given=false
+  lock_profiler=false
+		lock_profiler_given=false
 
 fi
 
+	disabled_by_default=${disabled_by_default}" lock_profiler"
+
+# 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
+
+	disabled_by_default=${disabled_by_default}" monolithic"
 
 
 # ===================================
@@ -6811,7 +6951,35 @@ fi
 if test x$defaults = xfalse; then
 	for option in $enabled_by_default; do
 		eval test x\${${option}_given} = xtrue && continue
-		let $option=false
+		eval $option=false
+	done
+fi
+
+# ==============================
+#  option to enable all options
+# ==============================
+
+# Check whether --enable-all was given.
+if test "${enable_all+set}" = set; then :
+  enableval=$enable_all; all_given=true
+		if test x$enableval = xyes; then
+			all=true
+		 else
+			all=false
+		fi
+else
+  all=false
+		all_given=false
+
+fi
+
+	disabled_by_default=${disabled_by_default}" all"
+
+
+if test x$all_given = xtrue; then
+	for option in $disabled_by_default; do
+		eval test x\${${option}_given} = xtrue && continue
+		eval $option=true
 	done
 fi
 
@@ -17646,6 +17814,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$save_CFLAGS"
 
+
 fi
 
 
@@ -17948,9 +18117,20 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 
-# check for the new register_printf_specifier function with len argument,
-# or the deprecated register_printf_function without
-ac_fn_c_check_func "$LINENO" "register_printf_specifier" "ac_cv_func_register_printf_specifier"
+case "$printf_hooks" in
+auto|builtin|glibc|vstr)
+	;;
+*)
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: invalid printf hook implementation, defaulting to 'auto'" >&5
+$as_echo "$as_me: invalid printf hook implementation, defaulting to 'auto'" >&6;}
+	printf_hooks=auto
+	;;
+esac
+
+if test x$printf_hooks = xauto -o x$printf_hooks = xglibc; then
+	# check for the new register_printf_specifier function with len argument,
+	# or the deprecated register_printf_function without
+	ac_fn_c_check_func "$LINENO" "register_printf_specifier" "ac_cv_func_register_printf_specifier"
 if test "x$ac_cv_func_register_printf_specifier" = xyes; then :
 
 $as_echo "#define HAVE_PRINTF_SPECIFIER /**/" >>confdefs.h
@@ -17963,9 +18143,14 @@ $as_echo "#define HAVE_PRINTF_FUNCTION /**/" >>confdefs.h
 
 else
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: printf does not support custom format specifiers!" >&5
-$as_echo "$as_me: printf does not support custom format specifiers!" >&6;}
-			builtin_printf=true
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: printf(3) does not support custom format specifiers!" >&5
+$as_echo "$as_me: printf(3) does not support custom format specifiers!" >&6;}
+				if test x$printf_hooks = xglibc; then
+					as_fn_error $? "please select a different printf hook implementation" "$LINENO" 5
+				else
+					# fallback to builtin printf hook implementation
+					printf_hooks=builtin
+				fi
 
 
 fi
@@ -17973,8 +18158,9 @@ fi
 
 fi
 
+fi
 
-if test x$vstr = xtrue; then
+if test x$printf_hooks = xvstr; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lvstr" >&5
 $as_echo_n "checking for main in -lvstr... " >&6; }
 if ${ac_cv_lib_vstr_main+:} false; then :
@@ -18014,10 +18200,9 @@ fi
 
 $as_echo "#define USE_VSTR /**/" >>confdefs.h
 
-	builtin_printf=false
 fi
 
-if test x$builtin_printf = xtrue; then
+if test x$printf_hooks = xbuiltin; then
 
 $as_echo "#define USE_BUILTIN_PRINTF /**/" >>confdefs.h
 
@@ -20162,7 +20347,6 @@ charon_plugins=
 starter_plugins=
 pool_plugins=
 attest_plugins=
-openac_plugins=
 scepclient_plugins=
 pki_plugins=
 scripts_plugins=
@@ -20181,7 +20365,6 @@ t_plugins=
 if test x$test_vectors = xtrue; then
 		s_plugins=${s_plugins}" test-vectors"
 		charon_plugins=${charon_plugins}" test-vectors"
-		openac_plugins=${openac_plugins}" test-vectors"
 		scepclient_plugins=${scepclient_plugins}" test-vectors"
 		pki_plugins=${pki_plugins}" test-vectors"
 
@@ -20255,7 +20438,6 @@ if test x$pkcs11 = xtrue; then
 if test x$aes = xtrue; then
 		s_plugins=${s_plugins}" aes"
 		charon_plugins=${charon_plugins}" aes"
-		openac_plugins=${openac_plugins}" aes"
 		scepclient_plugins=${scepclient_plugins}" aes"
 		pki_plugins=${pki_plugins}" aes"
 		scripts_plugins=${scripts_plugins}" aes"
@@ -20267,7 +20449,6 @@ if test x$aes = xtrue; then
 if test x$des = xtrue; then
 		s_plugins=${s_plugins}" des"
 		charon_plugins=${charon_plugins}" des"
-		openac_plugins=${openac_plugins}" des"
 		scepclient_plugins=${scepclient_plugins}" des"
 		pki_plugins=${pki_plugins}" des"
 		scripts_plugins=${scripts_plugins}" des"
@@ -20279,7 +20460,6 @@ if test x$des = xtrue; then
 if test x$blowfish = xtrue; then
 		s_plugins=${s_plugins}" blowfish"
 		charon_plugins=${charon_plugins}" blowfish"
-		openac_plugins=${openac_plugins}" blowfish"
 		scepclient_plugins=${scepclient_plugins}" blowfish"
 		pki_plugins=${pki_plugins}" blowfish"
 		scripts_plugins=${scripts_plugins}" blowfish"
@@ -20291,7 +20471,6 @@ if test x$blowfish = xtrue; then
 if test x$rc2 = xtrue; then
 		s_plugins=${s_plugins}" rc2"
 		charon_plugins=${charon_plugins}" rc2"
-		openac_plugins=${openac_plugins}" rc2"
 		scepclient_plugins=${scepclient_plugins}" rc2"
 		pki_plugins=${pki_plugins}" rc2"
 		scripts_plugins=${scripts_plugins}" rc2"
@@ -20303,7 +20482,6 @@ if test x$rc2 = xtrue; then
 if test x$sha1 = xtrue; then
 		s_plugins=${s_plugins}" sha1"
 		charon_plugins=${charon_plugins}" sha1"
-		openac_plugins=${openac_plugins}" sha1"
 		scepclient_plugins=${scepclient_plugins}" sha1"
 		pki_plugins=${pki_plugins}" sha1"
 		scripts_plugins=${scripts_plugins}" sha1"
@@ -20317,7 +20495,6 @@ if test x$sha1 = xtrue; then
 if test x$sha2 = xtrue; then
 		s_plugins=${s_plugins}" sha2"
 		charon_plugins=${charon_plugins}" sha2"
-		openac_plugins=${openac_plugins}" sha2"
 		scepclient_plugins=${scepclient_plugins}" sha2"
 		pki_plugins=${pki_plugins}" sha2"
 		scripts_plugins=${scripts_plugins}" sha2"
@@ -20331,7 +20508,6 @@ if test x$sha2 = xtrue; then
 if test x$md4 = xtrue; then
 		s_plugins=${s_plugins}" md4"
 		charon_plugins=${charon_plugins}" md4"
-		openac_plugins=${openac_plugins}" md4"
 		manager_plugins=${manager_plugins}" md4"
 		scepclient_plugins=${scepclient_plugins}" md4"
 		pki_plugins=${pki_plugins}" md4"
@@ -20343,7 +20519,6 @@ if test x$md4 = xtrue; then
 if test x$md5 = xtrue; then
 		s_plugins=${s_plugins}" md5"
 		charon_plugins=${charon_plugins}" md5"
-		openac_plugins=${openac_plugins}" md5"
 		scepclient_plugins=${scepclient_plugins}" md5"
 		pki_plugins=${pki_plugins}" md5"
 		scripts_plugins=${scripts_plugins}" md5"
@@ -20356,7 +20531,6 @@ if test x$md5 = xtrue; then
 if test x$rdrand = xtrue; then
 		s_plugins=${s_plugins}" rdrand"
 		charon_plugins=${charon_plugins}" rdrand"
-		openac_plugins=${openac_plugins}" rdrand"
 		scepclient_plugins=${scepclient_plugins}" rdrand"
 		pki_plugins=${pki_plugins}" rdrand"
 		scripts_plugins=${scripts_plugins}" rdrand"
@@ -20370,7 +20544,6 @@ if test x$rdrand = xtrue; then
 if test x$random = xtrue; then
 		s_plugins=${s_plugins}" random"
 		charon_plugins=${charon_plugins}" random"
-		openac_plugins=${openac_plugins}" random"
 		scepclient_plugins=${scepclient_plugins}" random"
 		pki_plugins=${pki_plugins}" random"
 		scripts_plugins=${scripts_plugins}" random"
@@ -20392,7 +20565,6 @@ if test x$nonce = xtrue; then
 if test x$x509 = xtrue; then
 		s_plugins=${s_plugins}" x509"
 		charon_plugins=${charon_plugins}" x509"
-		openac_plugins=${openac_plugins}" x509"
 		scepclient_plugins=${scepclient_plugins}" x509"
 		pki_plugins=${pki_plugins}" x509"
 		scripts_plugins=${scripts_plugins}" x509"
@@ -20418,6 +20590,12 @@ if test x$constraints = xtrue; then
 
 	fi
 
+if test x$acert = xtrue; then
+		s_plugins=${s_plugins}" acert"
+		charon_plugins=${charon_plugins}" acert"
+
+	fi
+
 if test x$pubkey = xtrue; then
 		s_plugins=${s_plugins}" pubkey"
 		charon_plugins=${charon_plugins}" pubkey"
@@ -20428,7 +20606,6 @@ if test x$pubkey = xtrue; then
 if test x$pkcs1 = xtrue; then
 		s_plugins=${s_plugins}" pkcs1"
 		charon_plugins=${charon_plugins}" pkcs1"
-		openac_plugins=${openac_plugins}" pkcs1"
 		scepclient_plugins=${scepclient_plugins}" pkcs1"
 		pki_plugins=${pki_plugins}" pkcs1"
 		scripts_plugins=${scripts_plugins}" pkcs1"
@@ -20454,7 +20631,6 @@ if test x$pkcs7 = xtrue; then
 if test x$pkcs8 = xtrue; then
 		s_plugins=${s_plugins}" pkcs8"
 		charon_plugins=${charon_plugins}" pkcs8"
-		openac_plugins=${openac_plugins}" pkcs8"
 		scepclient_plugins=${scepclient_plugins}" pkcs8"
 		pki_plugins=${pki_plugins}" pkcs8"
 		scripts_plugins=${scripts_plugins}" pkcs8"
@@ -20513,7 +20689,6 @@ if test x$ipseckey = xtrue; then
 if test x$pem = xtrue; then
 		s_plugins=${s_plugins}" pem"
 		charon_plugins=${charon_plugins}" pem"
-		openac_plugins=${openac_plugins}" pem"
 		scepclient_plugins=${scepclient_plugins}" pem"
 		pki_plugins=${pki_plugins}" pem"
 		scripts_plugins=${scripts_plugins}" pem"
@@ -20534,7 +20709,6 @@ if test x$padlock = xtrue; then
 if test x$openssl = xtrue; then
 		s_plugins=${s_plugins}" openssl"
 		charon_plugins=${charon_plugins}" openssl"
-		openac_plugins=${openac_plugins}" openssl"
 		scepclient_plugins=${scepclient_plugins}" openssl"
 		pki_plugins=${pki_plugins}" openssl"
 		scripts_plugins=${scripts_plugins}" openssl"
@@ -20549,7 +20723,6 @@ if test x$openssl = xtrue; then
 if test x$gcrypt = xtrue; then
 		s_plugins=${s_plugins}" gcrypt"
 		charon_plugins=${charon_plugins}" gcrypt"
-		openac_plugins=${openac_plugins}" gcrypt"
 		scepclient_plugins=${scepclient_plugins}" gcrypt"
 		pki_plugins=${pki_plugins}" gcrypt"
 		scripts_plugins=${scripts_plugins}" gcrypt"
@@ -20564,7 +20737,6 @@ if test x$gcrypt = xtrue; then
 if test x$af_alg = xtrue; then
 		s_plugins=${s_plugins}" af-alg"
 		charon_plugins=${charon_plugins}" af-alg"
-		openac_plugins=${openac_plugins}" af-alg"
 		scepclient_plugins=${scepclient_plugins}" af-alg"
 		pki_plugins=${pki_plugins}" af-alg"
 		scripts_plugins=${scripts_plugins}" af-alg"
@@ -20586,7 +20758,6 @@ if test x$fips_prf = xtrue; then
 if test x$gmp = xtrue; then
 		s_plugins=${s_plugins}" gmp"
 		charon_plugins=${charon_plugins}" gmp"
-		openac_plugins=${openac_plugins}" gmp"
 		scepclient_plugins=${scepclient_plugins}" gmp"
 		pki_plugins=${pki_plugins}" gmp"
 		scripts_plugins=${scripts_plugins}" gmp"
@@ -21125,7 +21296,6 @@ if test x$unit_tester = xtrue; then
 
 
 
-
 # ======================
 #  set Makefile.am vars
 # ======================
@@ -21300,6 +21470,14 @@ else
   USE_CONSTRAINTS_FALSE=
 fi
 
+ if test x$acert = xtrue; then
+  USE_ACERT_TRUE=
+  USE_ACERT_FALSE='#'
+else
+  USE_ACERT_TRUE='#'
+  USE_ACERT_FALSE=
+fi
+
  if test x$pubkey = xtrue; then
   USE_PUBKEY_TRUE=
   USE_PUBKEY_FALSE='#'
@@ -22357,7 +22535,7 @@ else
   USE_LIBCAP_FALSE=
 fi
 
- if test x$vstr = xtrue; then
+ if test x$printf_hooks = xvstr; then
   USE_VSTR_TRUE=
   USE_VSTR_FALSE='#'
 else
@@ -22365,7 +22543,7 @@ else
   USE_VSTR_FALSE=
 fi
 
- if test x$builtin_printf = xtrue; then
+ if test x$printf_hooks = xbuiltin; then
   USE_BUILTIN_PRINTF_TRUE=
   USE_BUILTIN_PRINTF_FALSE='#'
 else
@@ -22535,14 +22713,14 @@ fi
 #  build Makefiles
 # =================
 
-ac_config_files="$ac_config_files Makefile conf/Makefile man/Makefile init/Makefile init/systemd/Makefile src/Makefile src/include/Makefile src/libstrongswan/Makefile src/libstrongswan/plugins/aes/Makefile src/libstrongswan/plugins/cmac/Makefile src/libstrongswan/plugins/des/Makefile src/libstrongswan/plugins/blowfish/Makefile src/libstrongswan/plugins/rc2/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/rdrand/Makefile src/libstrongswan/plugins/random/Makefile src/libstrongswan/plugins/nonce/Makefile src/libstrongswan/plugins/hmac/Makefile src/libstrongswan/plugins/xcbc/Makefile src/libstrongswan/plugins/x509/Makefile src/libstrongswan/plugins/revocation/Makefile src/libstrongswan/plugins/constraints/Makefile src/libstrongswan/plugins/pubkey/Makefile src/libstrongswan/plugins/pkcs1/Makefile src/libstrongswan/plugins/pkcs7/Makefile src/libstrongswan/plugins/pkcs8/Makefile src/libstrongswan/plugins/pkcs12/Makefile src/libstrongswan/plugins/pgp/Makefile src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/sshkey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/Makefile src/libstrongswan/plugins/unbound/Makefile src/libstrongswan/plugins/soup/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/keychain/Makefile src/libstrongswan/plugins/pkcs11/Makefile src/libstrongswan/plugins/ctr/Makefile src/libstrongswan/plugins/ccm/Makefile src/libstrongswan/plugins/gcm/Makefile src/libstrongswan/plugins/af_alg/Makefile src/libstrongswan/plugins/ntru/Makefile src/libstrongswan/plugins/test_vectors/Makefile src/libstrongswan/tests/Makefile src/libhydra/Makefile src/libhydra/plugins/attr/Makefile src/libhydra/plugins/attr_sql/Makefile src/libhydra/plugins/kernel_klips/Makefile src/libhydra/plugins/kernel_netlink/Makefile src/libhydra/plugins/kernel_pfkey/Makefile src/libhydra/plugins/kernel_pfroute/Makefile src/libhydra/plugins/resolve/Makefile src/libipsec/Makefile src/libsimaka/Makefile src/libtls/Makefile src/libradius/Makefile src/libtncif/Makefile src/libtnccs/Makefile src/libtnccs/plugins/tnc_tnccs/Makefile src/libtnccs/plugins/tnc_imc/Makefile src/libtnccs/plugins/tnc_imv/Makefile src/libtnccs/plugins/tnccs_11/Makefile src/libtnccs/plugins/tnccs_20/Makefile src/libtnccs/plugins/tnccs_dynamic/Makefile src/libpttls/Makefile src/libpts/Makefile src/libpts/plugins/imc_attestation/Makefile src/libpts/plugins/imv_attestation/Makefile src/libpts/plugins/imc_swid/Makefile src/libpts/plugins/imv_swid/Makefile src/libimcv/Makefile src/libimcv/plugins/imc_test/Makefile src/libimcv/plugins/imv_test/Makefile src/libimcv/plugins/imc_scanner/Makefile src/libimcv/plugins/imv_scanner/Makefile src/libimcv/plugins/imc_os/Makefile src/libimcv/plugins/imv_os/Makefile src/charon/Makefile src/charon-nm/Makefile src/charon-tkm/Makefile src/charon-cmd/Makefile src/libcharon/Makefile src/libcharon/plugins/eap_aka/Makefile src/libcharon/plugins/eap_aka_3gpp2/Makefile src/libcharon/plugins/eap_dynamic/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_sim_pcsc/Makefile src/libcharon/plugins/eap_simaka_sql/Makefile src/libcharon/plugins/eap_simaka_pseudonym/Makefile src/libcharon/plugins/eap_simaka_reauth/Makefile src/libcharon/plugins/eap_mschapv2/Makefile src/libcharon/plugins/eap_tls/Makefile src/libcharon/plugins/eap_ttls/Makefile src/libcharon/plugins/eap_peap/Makefile src/libcharon/plugins/eap_tnc/Makefile src/libcharon/plugins/eap_radius/Makefile src/libcharon/plugins/xauth_generic/Makefile src/libcharon/plugins/xauth_eap/Makefile src/libcharon/plugins/xauth_pam/Makefile src/libcharon/plugins/xauth_noauth/Makefile src/libcharon/plugins/tnc_ifmap/Makefile src/libcharon/plugins/tnc_pdp/Makefile src/libcharon/plugins/socket_default/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/dnscert/Makefile src/libcharon/plugins/ipseckey/Makefile src/libcharon/plugins/medsrv/Makefile src/libcharon/plugins/medcli/Makefile src/libcharon/plugins/addrblock/Makefile src/libcharon/plugins/unity/Makefile src/libcharon/plugins/uci/Makefile src/libcharon/plugins/ha/Makefile src/libcharon/plugins/kernel_libipsec/Makefile src/libcharon/plugins/whitelist/Makefile src/libcharon/plugins/lookip/Makefile src/libcharon/plugins/error_notify/Makefile src/libcharon/plugins/certexpire/Makefile src/libcharon/plugins/systime_fix/Makefile src/libcharon/plugins/led/Makefile src/libcharon/plugins/duplicheck/Makefile src/libcharon/plugins/coupling/Makefile src/libcharon/plugins/radattr/Makefile src/libcharon/plugins/osx_attr/Makefile src/libcharon/plugins/android_dns/Makefile src/libcharon/plugins/android_log/Makefile src/libcharon/plugins/maemo/Makefile src/libcharon/plugins/stroke/Makefile src/libcharon/plugins/updown/Makefile src/libcharon/plugins/dhcp/Makefile src/libcharon/plugins/unit_tester/Makefile src/libcharon/plugins/load_tester/Makefile src/stroke/Makefile src/ipsec/Makefile src/starter/Makefile src/_updown/Makefile src/_updown_espmark/Makefile src/_copyright/Makefile src/openac/Makefile src/scepclient/Makefile src/pki/Makefile src/pki/man/Makefile src/pool/Makefile src/dumm/Makefile src/dumm/ext/extconf.rb src/libfast/Makefile src/manager/Makefile src/medsrv/Makefile src/checksum/Makefile src/conftest/Makefile src/pt-tls-client/Makefile scripts/Makefile testing/Makefile"
+ac_config_files="$ac_config_files Makefile conf/Makefile man/Makefile init/Makefile init/systemd/Makefile src/Makefile src/include/Makefile src/libstrongswan/Makefile src/libstrongswan/plugins/aes/Makefile src/libstrongswan/plugins/cmac/Makefile src/libstrongswan/plugins/des/Makefile src/libstrongswan/plugins/blowfish/Makefile src/libstrongswan/plugins/rc2/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/rdrand/Makefile src/libstrongswan/plugins/random/Makefile src/libstrongswan/plugins/nonce/Makefile src/libstrongswan/plugins/hmac/Makefile src/libstrongswan/plugins/xcbc/Makefile src/libstrongswan/plugins/x509/Makefile src/libstrongswan/plugins/revocation/Makefile src/libstrongswan/plugins/constraints/Makefile src/libstrongswan/plugins/acert/Makefile src/libstrongswan/plugins/pubkey/Makefile src/libstrongswan/plugins/pkcs1/Makefile src/libstrongswan/plugins/pkcs7/Makefile src/libstrongswan/plugins/pkcs8/Makefile src/libstrongswan/plugins/pkcs12/Makefile src/libstrongswan/plugins/pgp/Makefile src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/sshkey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/Makefile src/libstrongswan/plugins/unbound/Makefile src/libstrongswan/plugins/soup/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/keychain/Makefile src/libstrongswan/plugins/pkcs11/Makefile src/libstrongswan/plugins/ctr/Makefile src/libstrongswan/plugins/ccm/Makefile src/libstrongswan/plugins/gcm/Makefile src/libstrongswan/plugins/af_alg/Makefile src/libstrongswan/plugins/ntru/Makefile src/libstrongswan/plugins/test_vectors/Makefile src/libstrongswan/tests/Makefile src/libhydra/Makefile src/libhydra/plugins/attr/Makefile src/libhydra/plugins/attr_sql/Makefile src/libhydra/plugins/kernel_klips/Makefile src/libhydra/plugins/kernel_netlink/Makefile src/libhydra/plugins/kernel_pfkey/Makefile src/libhydra/plugins/kernel_pfroute/Makefile src/libhydra/plugins/resolve/Makefile src/libipsec/Makefile src/libsimaka/Makefile src/libtls/Makefile src/libtls/tests/Makefile src/libradius/Makefile src/libtncif/Makefile src/libtnccs/Makefile src/libtnccs/plugins/tnc_tnccs/Makefile src/libtnccs/plugins/tnc_imc/Makefile src/libtnccs/plugins/tnc_imv/Makefile src/libtnccs/plugins/tnccs_11/Makefile src/libtnccs/plugins/tnccs_20/Makefile src/libtnccs/plugins/tnccs_dynamic/Makefile src/libpttls/Makefile src/libpts/Makefile src/libpts/plugins/imc_attestation/Makefile src/libpts/plugins/imv_attestation/Makefile src/libpts/plugins/imc_swid/Makefile src/libpts/plugins/imv_swid/Makefile src/libimcv/Makefile src/libimcv/plugins/imc_test/Makefile src/libimcv/plugins/imv_test/Makefile src/libimcv/plugins/imc_scanner/Makefile src/libimcv/plugins/imv_scanner/Makefile src/libimcv/plugins/imc_os/Makefile src/libimcv/plugins/imv_os/Makefile src/charon/Makefile src/charon-nm/Makefile src/charon-tkm/Makefile src/charon-cmd/Makefile src/libcharon/Makefile src/libcharon/plugins/eap_aka/Makefile src/libcharon/plugins/eap_aka_3gpp2/Makefile src/libcharon/plugins/eap_dynamic/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_sim_pcsc/Makefile src/libcharon/plugins/eap_simaka_sql/Makefile src/libcharon/plugins/eap_simaka_pseudonym/Makefile src/libcharon/plugins/eap_simaka_reauth/Makefile src/libcharon/plugins/eap_mschapv2/Makefile src/libcharon/plugins/eap_tls/Makefile src/libcharon/plugins/eap_ttls/Makefile src/libcharon/plugins/eap_peap/Makefile src/libcharon/plugins/eap_tnc/Makefile src/libcharon/plugins/eap_radius/Makefile src/libcharon/plugins/xauth_generic/Makefile src/libcharon/plugins/xauth_eap/Makefile src/libcharon/plugins/xauth_pam/Makefile src/libcharon/plugins/xauth_noauth/Makefile src/libcharon/plugins/tnc_ifmap/Makefile src/libcharon/plugins/tnc_pdp/Makefile src/libcharon/plugins/socket_default/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/dnscert/Makefile src/libcharon/plugins/ipseckey/Makefile src/libcharon/plugins/medsrv/Makefile src/libcharon/plugins/medcli/Makefile src/libcharon/plugins/addrblock/Makefile src/libcharon/plugins/unity/Makefile src/libcharon/plugins/uci/Makefile src/libcharon/plugins/ha/Makefile src/libcharon/plugins/kernel_libipsec/Makefile src/libcharon/plugins/whitelist/Makefile src/libcharon/plugins/lookip/Makefile src/libcharon/plugins/error_notify/Makefile src/libcharon/plugins/certexpire/Makefile src/libcharon/plugins/systime_fix/Makefile src/libcharon/plugins/led/Makefile src/libcharon/plugins/duplicheck/Makefile src/libcharon/plugins/coupling/Makefile src/libcharon/plugins/radattr/Makefile src/libcharon/plugins/osx_attr/Makefile src/libcharon/plugins/android_dns/Makefile src/libcharon/plugins/android_log/Makefile src/libcharon/plugins/maemo/Makefile src/libcharon/plugins/stroke/Makefile src/libcharon/plugins/updown/Makefile src/libcharon/plugins/dhcp/Makefile src/libcharon/plugins/unit_tester/Makefile src/libcharon/plugins/load_tester/Makefile src/stroke/Makefile src/ipsec/Makefile src/starter/Makefile src/_updown/Makefile src/_updown_espmark/Makefile src/_copyright/Makefile src/scepclient/Makefile src/pki/Makefile src/pki/man/Makefile src/pool/Makefile src/dumm/Makefile src/dumm/ext/extconf.rb src/libfast/Makefile src/manager/Makefile src/medsrv/Makefile src/checksum/Makefile src/conftest/Makefile src/pt-tls-client/Makefile scripts/Makefile testing/Makefile"
 
 
 # =================
 #  build man pages
 # =================
 
-ac_config_files="$ac_config_files conf/strongswan.conf.5.head conf/strongswan.conf.5.tail man/ipsec.conf.5 man/ipsec.secrets.5 src/charon-cmd/charon-cmd.8 src/pki/man/pki.1 src/pki/man/pki---gen.1 src/pki/man/pki---issue.1 src/pki/man/pki---keyid.1 src/pki/man/pki---pkcs7.1 src/pki/man/pki---print.1 src/pki/man/pki---pub.1 src/pki/man/pki---req.1 src/pki/man/pki---self.1 src/pki/man/pki---signcrl.1 src/pki/man/pki---verify.1"
+ac_config_files="$ac_config_files conf/strongswan.conf.5.head conf/strongswan.conf.5.tail man/ipsec.conf.5 man/ipsec.secrets.5 src/charon-cmd/charon-cmd.8 src/pki/man/pki.1 src/pki/man/pki---gen.1 src/pki/man/pki---issue.1 src/pki/man/pki---keyid.1 src/pki/man/pki---pkcs7.1 src/pki/man/pki---print.1 src/pki/man/pki---pub.1 src/pki/man/pki---req.1 src/pki/man/pki---self.1 src/pki/man/pki---signcrl.1 src/pki/man/pki---acert.1 src/pki/man/pki---verify.1"
 
 
 cat >confcache <<\_ACEOF
@@ -22771,6 +22949,10 @@ if test -z "${USE_CONSTRAINTS_TRUE}" && test -z "${USE_CONSTRAINTS_FALSE}"; then
   as_fn_error $? "conditional \"USE_CONSTRAINTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_ACERT_TRUE}" && test -z "${USE_ACERT_FALSE}"; then
+  as_fn_error $? "conditional \"USE_ACERT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_PUBKEY_TRUE}" && test -z "${USE_PUBKEY_FALSE}"; then
   as_fn_error $? "conditional \"USE_PUBKEY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23744,7 +23926,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 5.1.2, which was
+This file was extended by strongSwan $as_me 5.1.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23810,7 +23992,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-strongSwan config.status 5.1.2
+strongSwan config.status 5.1.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -24246,6 +24428,7 @@ do
     "src/libstrongswan/plugins/x509/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/x509/Makefile" ;;
     "src/libstrongswan/plugins/revocation/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/revocation/Makefile" ;;
     "src/libstrongswan/plugins/constraints/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/constraints/Makefile" ;;
+    "src/libstrongswan/plugins/acert/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/acert/Makefile" ;;
     "src/libstrongswan/plugins/pubkey/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pubkey/Makefile" ;;
     "src/libstrongswan/plugins/pkcs1/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pkcs1/Makefile" ;;
     "src/libstrongswan/plugins/pkcs7/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pkcs7/Makefile" ;;
@@ -24285,6 +24468,7 @@ do
     "src/libipsec/Makefile") CONFIG_FILES="$CONFIG_FILES src/libipsec/Makefile" ;;
     "src/libsimaka/Makefile") CONFIG_FILES="$CONFIG_FILES src/libsimaka/Makefile" ;;
     "src/libtls/Makefile") CONFIG_FILES="$CONFIG_FILES src/libtls/Makefile" ;;
+    "src/libtls/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/libtls/tests/Makefile" ;;
     "src/libradius/Makefile") CONFIG_FILES="$CONFIG_FILES src/libradius/Makefile" ;;
     "src/libtncif/Makefile") CONFIG_FILES="$CONFIG_FILES src/libtncif/Makefile" ;;
     "src/libtnccs/Makefile") CONFIG_FILES="$CONFIG_FILES src/libtnccs/Makefile" ;;
@@ -24374,7 +24558,6 @@ do
     "src/_updown/Makefile") CONFIG_FILES="$CONFIG_FILES src/_updown/Makefile" ;;
     "src/_updown_espmark/Makefile") CONFIG_FILES="$CONFIG_FILES src/_updown_espmark/Makefile" ;;
     "src/_copyright/Makefile") CONFIG_FILES="$CONFIG_FILES src/_copyright/Makefile" ;;
-    "src/openac/Makefile") CONFIG_FILES="$CONFIG_FILES src/openac/Makefile" ;;
     "src/scepclient/Makefile") CONFIG_FILES="$CONFIG_FILES src/scepclient/Makefile" ;;
     "src/pki/Makefile") CONFIG_FILES="$CONFIG_FILES src/pki/Makefile" ;;
     "src/pki/man/Makefile") CONFIG_FILES="$CONFIG_FILES src/pki/man/Makefile" ;;
@@ -24404,6 +24587,7 @@ do
     "src/pki/man/pki---req.1") CONFIG_FILES="$CONFIG_FILES src/pki/man/pki---req.1" ;;
     "src/pki/man/pki---self.1") CONFIG_FILES="$CONFIG_FILES src/pki/man/pki---self.1" ;;
     "src/pki/man/pki---signcrl.1") CONFIG_FILES="$CONFIG_FILES src/pki/man/pki---signcrl.1" ;;
+    "src/pki/man/pki---acert.1") CONFIG_FILES="$CONFIG_FILES src/pki/man/pki---acert.1" ;;
     "src/pki/man/pki---verify.1") CONFIG_FILES="$CONFIG_FILES src/pki/man/pki---verify.1" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;