diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2013-01-02 14:18:20 +0100 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2013-01-02 14:18:20 +0100 |
| commit | c1343b3278cdf99533b7902744d15969f9d6fdc1 (patch) | |
| tree | d5ed3dc5677a59260ec41cd39bb284d3e94c91b3 /configure | |
| parent | b34738ed08c2227300d554b139e2495ca5da97d6 (diff) | |
| download | vyos-strongswan-c1343b3278cdf99533b7902744d15969f9d6fdc1.tar.gz vyos-strongswan-c1343b3278cdf99533b7902744d15969f9d6fdc1.zip | |
Imported Upstream version 5.0.1
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 1771 |
1 files changed, 1170 insertions, 601 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for strongSwan 4.6.4. +# Generated by GNU Autoconf 2.67 for strongSwan 5.0.1. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -698,8 +698,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='strongSwan' PACKAGE_TARNAME='strongswan' -PACKAGE_VERSION='4.6.4' -PACKAGE_STRING='strongSwan 4.6.4' +PACKAGE_VERSION='5.0.1' +PACKAGE_STRING='strongSwan 5.0.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -767,6 +767,8 @@ USE_LIBTNCCS_FALSE USE_LIBTNCCS_TRUE USE_LIBTNCIF_FALSE USE_LIBTNCIF_TRUE +USE_LIBIPSEC_FALSE +USE_LIBIPSEC_TRUE USE_LIBCHARON_FALSE USE_LIBCHARON_TRUE USE_LIBHYDRA_FALSE @@ -779,14 +781,18 @@ USE_SCRIPTS_FALSE USE_SCRIPTS_TRUE USE_TOOLS_FALSE USE_TOOLS_TRUE +USE_NM_FALSE +USE_NM_TRUE USE_CHARON_FALSE USE_CHARON_TRUE USE_ADNS_FALSE USE_ADNS_TRUE USE_THREADS_FALSE USE_THREADS_TRUE -USE_PLUTO_FALSE -USE_PLUTO_TRUE +USE_IKEV2_FALSE +USE_IKEV2_TRUE +USE_IKEV1_FALSE +USE_IKEV1_TRUE USE_LOAD_WARNING_FALSE USE_LOAD_WARNING_TRUE USE_INTEGRITY_TEST_FALSE @@ -799,22 +805,10 @@ USE_FAST_FALSE USE_FAST_TRUE USE_DUMM_FALSE USE_DUMM_TRUE -USE_XAUTH_VID_FALSE -USE_XAUTH_VID_TRUE -USE_VENDORID_FALSE -USE_VENDORID_TRUE -USE_NAT_TRANSPORT_FALSE -USE_NAT_TRANSPORT_TRUE USE_LOCK_PROFILER_FALSE USE_LOCK_PROFILER_TRUE USE_LEAK_DETECTIVE_FALSE USE_LEAK_DETECTIVE_TRUE -USE_CISCO_QUIRKS_FALSE -USE_CISCO_QUIRKS_TRUE -USE_SMARTCARD_FALSE -USE_SMARTCARD_TRUE -USE_XAUTH_FALSE -USE_XAUTH_TRUE USE_RESOLVE_FALSE USE_RESOLVE_TRUE USE_KERNEL_PFROUTE_FALSE @@ -829,14 +823,14 @@ USE_ATTR_SQL_FALSE USE_ATTR_SQL_TRUE USE_ATTR_FALSE USE_ATTR_TRUE +USE_UNITY_FALSE +USE_UNITY_TRUE USE_ADDRBLOCK_FALSE USE_ADDRBLOCK_TRUE USE_FARP_FALSE USE_FARP_TRUE USE_SOCKET_DYNAMIC_FALSE USE_SOCKET_DYNAMIC_TRUE -USE_SOCKET_RAW_FALSE -USE_SOCKET_RAW_TRUE USE_SOCKET_DEFAULT_FALSE USE_SOCKET_DEFAULT_TRUE USE_IMV_ATTESTATION_FALSE @@ -867,8 +861,16 @@ USE_TNC_PDP_FALSE USE_TNC_PDP_TRUE USE_TNC_IFMAP_FALSE USE_TNC_IFMAP_TRUE +USE_XAUTH_PAM_FALSE +USE_XAUTH_PAM_TRUE +USE_XAUTH_EAP_FALSE +USE_XAUTH_EAP_TRUE +USE_XAUTH_GENERIC_FALSE +USE_XAUTH_GENERIC_TRUE USE_EAP_RADIUS_FALSE USE_EAP_RADIUS_TRUE +USE_EAP_DYNAMIC_FALSE +USE_EAP_DYNAMIC_TRUE USE_EAP_TNC_FALSE USE_EAP_TNC_TRUE USE_EAP_PEAP_FALSE @@ -929,12 +931,12 @@ USE_SMP_FALSE USE_SMP_TRUE USE_MAEMO_FALSE USE_MAEMO_TRUE +USE_ANDROID_LOG_FALSE +USE_ANDROID_LOG_TRUE USE_ANDROID_FALSE USE_ANDROID_TRUE USE_UCI_FALSE USE_UCI_TRUE -USE_NM_FALSE -USE_NM_TRUE USE_MEDCLI_FALSE USE_MEDCLI_TRUE USE_MEDSRV_FALSE @@ -987,6 +989,8 @@ USE_REVOCATION_FALSE USE_REVOCATION_TRUE USE_X509_FALSE USE_X509_TRUE +USE_NONCE_FALSE +USE_NONCE_TRUE USE_RANDOM_FALSE USE_RANDOM_TRUE USE_GMP_FALSE @@ -1019,6 +1023,7 @@ s_plugins h_plugins p_plugins c_plugins +nm_plugins medsrv_plugins manager_plugins scripts_plugins @@ -1028,8 +1033,11 @@ openac_plugins attest_plugins pool_plugins starter_plugins -pluto_plugins -libcharon_plugins +charon_plugins +dev_headers +USE_DEV_HEADERS_FALSE +USE_DEV_HEADERS_TRUE +BFDLIB nm_LIBS nm_CFLAGS pcsclite_LIBS @@ -1108,11 +1116,15 @@ CPPFLAGS LDFLAGS CFLAGS CC +ipsec_script_upper +charon_natt_port +charon_udp_port ipsecgroup ipsecuser systemdsystemunitdir HAVE_SYSTEMD_FALSE HAVE_SYSTEMD_TRUE +ipsec_script routing_table_prio routing_table linux_headers @@ -1126,7 +1138,6 @@ resolv_conf strongswan_conf urandom_device random_device -default_pkcs11 PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG @@ -1194,7 +1205,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -with_default_pkcs11 with_random_device with_urandom_device with_strongswan_conf @@ -1208,12 +1218,15 @@ with_nm_ca_dir with_linux_headers with_routing_table with_routing_table_prio +with_ipsec_script with_capabilities with_mpz_powm_sec +with_dev_headers with_systemdsystemunitdir -with_xauth_module with_user with_group +with_charon_udp_port +with_charon_natt_port enable_curl enable_soup enable_ldap @@ -1227,6 +1240,7 @@ enable_sha2 enable_fips_prf enable_gmp enable_random +enable_nonce enable_x509 enable_revocation enable_constraints @@ -1248,8 +1262,6 @@ enable_medsrv enable_medcli enable_smp enable_sql -enable_smartcard -enable_cisco_quirks enable_leak_detective enable_lock_profiler enable_unit_tester @@ -1270,7 +1282,11 @@ enable_eap_tls enable_eap_ttls enable_eap_peap enable_eap_tnc +enable_eap_dynamic enable_eap_radius +enable_xauth_generic +enable_xauth_eap +enable_xauth_pam enable_tnc_ifmap enable_tnc_pdp enable_tnc_imc @@ -1288,23 +1304,18 @@ enable_kernel_netlink enable_kernel_pfkey enable_kernel_pfroute enable_kernel_klips +enable_libipsec enable_socket_default -enable_socket_raw enable_socket_dynamic enable_farp -enable_nat_transport -enable_vendor_id -enable_xauth_vid enable_dumm enable_fast enable_manager enable_mediation enable_integrity_test enable_load_warning -enable_pluto -enable_xauth -enable_threads -enable_adns +enable_ikev1 +enable_ikev2 enable_charon enable_tools enable_scripts @@ -1323,8 +1334,10 @@ enable_ctr enable_ccm enable_gcm enable_addrblock +enable_unity enable_uci enable_android +enable_android_log enable_maemo enable_nm enable_ha @@ -1336,6 +1349,7 @@ enable_coupling enable_radattr enable_vstr enable_monolithic +enable_bfd_backtraces enable_dependency_tracking with_lib_prefix enable_shared @@ -1915,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 4.6.4 to adapt to many kinds of systems. +\`configure' configures strongSwan 5.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1985,7 +1999,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of strongSwan 4.6.4:";; + short | recursive ) echo "Configuration of strongSwan 5.0.1:";; esac cat <<\_ACEOF @@ -2011,6 +2025,7 @@ Optional Features: --disable-gmp disable GNU MP (libgmp) based crypto implementation 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. @@ -2028,8 +2043,7 @@ Optional Features: --enable-mysql enable MySQL database support. Requires libmysqlclient_r. --enable-sqlite enable SQLite database support. Requires libsqlite3. - --disable-stroke disable charons stroke (pluto compatibility) - configuration backend. + --disable-stroke disable charons stroke configuration backend. --enable-medsrv enable mediation server web frontend and daemon plugin. --enable-medcli enable mediation client configuration database @@ -2037,8 +2051,6 @@ Optional Features: --enable-smp enable SMP configuration and control interface. Requires libxml. --enable-sql enable SQL database configuration backend. - --enable-smartcard enable smartcard support. - --enable-cisco-quirks enable support of Cisco VPN client. --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. @@ -2059,13 +2071,18 @@ Optional Features: plugin. --enable-eap-identity enable EAP module providing EAP-Identity helper. --enable-eap-md5 enable EAP MD5 (CHAP) authentication module. - --enable-eap-gtc enable PAM based EAP GTC authentication module. + --enable-eap-gtc enable EAP GTC authentication module. --enable-eap-mschapv2 enable EAP MS-CHAPv2 authentication module. --enable-eap-tls enable EAP TLS authentication module. --enable-eap-ttls enable EAP TTLS authentication module. --enable-eap-peap enable EAP PEAP authentication module. --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. + --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-tnc-ifmap enable TNC IF-MAP module. --enable-tnc-pdp enable TNC policy decision point module. --enable-tnc-imc enable TNC IMC module. @@ -2086,18 +2103,12 @@ Optional Features: --enable-kernel-pfkey enable the PF_KEY kernel interface. --enable-kernel-pfroute enable the PF_ROUTE kernel interface. --enable-kernel-klips enable the KLIPS kernel interface. + --enable-libipsec enable user space IPsec implementation. --disable-socket-default disable default socket implementation for charon. - --enable-socket-raw enable raw socket implementation of charon, enforced - if pluto is enabled --enable-socket-dynamic enable dynamic socket implementation for charon --enable-farp enable ARP faking plugin that responds to ARP requests to peers virtual IP - --enable-nat-transport enable NAT traversal with IPsec transport mode in - pluto. - --disable-vendor-id disable the sending of the strongSwan vendor ID in - pluto. - --disable-xauth-vid disable the sending of the XAUTH vendor ID. --enable-dumm enable the DUMM UML test framework. --enable-fast enable libfast (FastCGI Application Server w/ templates. @@ -2105,15 +2116,11 @@ Optional Features: --enable-mediation enable IKEv2 Mediation Extension. --enable-integrity-test enable integrity testing of libstrongswan and plugins. - --disable-load-warning disable the charon/pluto plugin load option warning - in starter. - --disable-pluto disable the IKEv1 keying daemon pluto. - --disable-xauth disable xauth plugin. - --disable-threads disable the use of threads in pluto. Charon always - uses threads. - --disable-adns disable the use of adns in pluto (disables - opportunistic encryption). - --disable-charon disable the IKEv2 keying daemon charon. + --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 @@ -2134,10 +2141,12 @@ Optional Features: --enable-ccm enables the CCM AEAD wrapper crypto plugin. --enable-gcm enables the GCM AEAD wrapper crypto plugin. --enable-addrblock enables RFC 3779 address block constraint support. + --enable-unity enables Cisco Unity extension plugin. --enable-uci enable OpenWRT UCI configuration plugin. --enable-android enable Android specific plugin. + --enable-android-log enable Android specific logger plugin. --enable-maemo enable Maemo specific plugin. - --enable-nm enable NetworkManager plugin. + --enable-nm enable NetworkManager backend. --enable-ha enable high availability cluster plugin. --enable-whitelist enable peer identity whitelisting plugin. --enable-certexpire enable CSV export of expiration dates of used @@ -2155,6 +2164,8 @@ Optional Features: --enable-monolithic build monolithic version of libstrongswan that includes all enabled plugins. Similarly, the plugins of charon are assembled in libcharon. + --enable-bfd-backtraces use binutils libbfd to resolve backtraces for memory + leaks and segfaults. --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] @@ -2166,9 +2177,6 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-default-pkcs11=arg - set the default PKCS11 library (default: - /usr/lib/opensc-pkcs11.so). --with-random-device=arg set the device to read real random data from (default: /dev/random). @@ -2190,8 +2198,9 @@ Optional Packages: ${ipseclibdir%/}/plugins). --with-imcvdir=arg set the installation path of IMC and IMV dynamic librariers (default: ${ipseclibdir%/}/imcvs). - --with-nm-ca-dir=arg directory the NM plugin uses to look up trusted root - certificates (default: /usr/share/ca-certificates). + --with-nm-ca-dir=arg directory the NM backend uses to look up trusted + root certificates (default: + /usr/share/ca-certificates). --with-linux-headers=arg set directory of linux header files to use (default: \${top_srcdir}/src/include). @@ -2200,18 +2209,28 @@ Optional Packages: 220). --with-routing-table-prio=arg set priority for IPsec routing table (default: 220). + --with-ipsec-script=arg change the name of the ipsec script (default: + ipsec). --with-capabilities=arg set capability dropping library. Currently supported values are "libcap" and "native" (default: no). --with-mpz_powm_sec=arg use the more side-channel resistant mpz_powm_sec in libgmp, if available (default: yes). + --with-dev-headers=arg install strongSwan development headers to directory. + (default: no). --with-systemdsystemunitdir=arg directory for systemd service files (default: $systemdsystemunitdir_default). - --with-xauth-module=lib set the path to the XAUTH module --with-user=user change user of the daemons to "user" after startup (default is "root"). --with-group=group change group of the daemons to "group" after startup (default is "root"). + --with-charon-udp-port=port + UDP port used by charon locally (default 500). Set + to 0 to allocate randomly. + --with-charon-natt-port=port + UDP port used by charon locally in case a NAT is + detected (must be different from charon-udp-port, + default 4500). Set to 0 to allocate randomly. --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib --without-lib-prefix don't search for libraries in includedir and libdir --with-pic try to use only PIC/non-PIC objects [default=use @@ -2322,7 +2341,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -strongSwan configure 4.6.4 +strongSwan configure 5.0.1 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2651,6 +2670,52 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_type +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. +ac_fn_c_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_decl + # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists, giving a warning if it cannot be compiled using @@ -2798,7 +2863,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by strongSwan $as_me 4.6.4, which was +It was created by strongSwan $as_me 5.0.1, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3613,7 +3678,7 @@ fi # Define the identity of the package. PACKAGE='strongswan' - VERSION='4.6.4' + VERSION='5.0.1' cat >>confdefs.h <<_ACEOF @@ -3735,6 +3800,11 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; } +ac_config_headers="$ac_config_headers config.h" + + +$as_echo "#define CONFIG_H_INCLUDED /**/" >>confdefs.h + @@ -3869,18 +3939,6 @@ fi -# Check whether --with-default-pkcs11 was given. -if test "${with_default_pkcs11+set}" = set; then : - withval=$with_default_pkcs11; default_pkcs11="$withval" - -else - default_pkcs11="/usr/lib/opensc-pkcs11.so" - - -fi - - - # Check whether --with-random-device was given. if test "${with_random_device+set}" = set; then : withval=$with_random_device; random_device="$withval" @@ -4037,6 +4095,18 @@ fi +# Check whether --with-ipsec-script was given. +if test "${with_ipsec_script+set}" = set; then : + withval=$with_ipsec_script; ipsec_script="$withval" + +else + ipsec_script="ipsec" + + +fi + + + # Check whether --with-capabilities was given. if test "${with_capabilities+set}" = set; then : @@ -4058,6 +4128,16 @@ fi +# Check whether --with-dev-headers was given. +if test "${with_dev_headers+set}" = set; then : + withval=$with_dev_headers; dev_headers="$withval" +else + dev_headers=no + +fi + + + if test -n "$PKG_CONFIG"; then systemdsystemunitdir_default=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) fi @@ -4082,22 +4162,14 @@ fi -# Check whether --with-xauth-module was given. -if test "${with_xauth_module+set}" = set; then : - withval=$with_xauth_module; cat >>confdefs.h <<_ACEOF -#define XAUTH_DEFAULT_LIB "$withval" -_ACEOF - -fi - - - # Check whether --with-user was given. if test "${with_user+set}" = set; then : - withval=$with_user; cat >>confdefs.h <<_ACEOF + withval=$with_user; +cat >>confdefs.h <<_ACEOF #define IPSEC_USER "$withval" _ACEOF - ipsecuser="$withval" + + ipsecuser="$withval" else ipsecuser="root" @@ -4109,10 +4181,12 @@ fi # Check whether --with-group was given. if test "${with_group+set}" = set; then : - withval=$with_group; cat >>confdefs.h <<_ACEOF + withval=$with_group; +cat >>confdefs.h <<_ACEOF #define IPSEC_GROUP "$withval" _ACEOF - ipsecgroup="$withval" + + ipsecgroup="$withval" else ipsecgroup="root" @@ -4122,6 +4196,53 @@ fi +# Check whether --with-charon-udp-port was given. +if test "${with_charon_udp_port+set}" = set; then : + withval=$with_charon_udp_port; +cat >>confdefs.h <<_ACEOF +#define CHARON_UDP_PORT $withval +_ACEOF + + charon_udp_port=$withval + +else + charon_udp_port=500 + + +fi + + + +# Check whether --with-charon-natt-port was given. +if test "${with_charon_natt_port+set}" = set; then : + withval=$with_charon_natt_port; +cat >>confdefs.h <<_ACEOF +#define CHARON_NATT_PORT $withval +_ACEOF + + charon_natt_port=$withval + +else + charon_natt_port=4500 + + +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking configured UDP ports ($charon_udp_port, $charon_natt_port)" >&5 +$as_echo_n "checking configured UDP ports ($charon_udp_port, $charon_natt_port)... " >&6; } +if test x$charon_udp_port != x0 -a x$charon_udp_port = x$charon_natt_port; then + as_fn_error $? "the ports have to be different" "$LINENO" 5 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } +fi + +# convert script name to uppercase +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 @@ -4328,6 +4449,21 @@ else fi +# 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 + nonce=true + else + nonce=false + fi +else + nonce=true + nonce_given=false + +fi + + # Check whether --enable-x509 was given. if test "${enable_x509+set}" = set; then : enableval=$enable_x509; x509_given=true @@ -4643,36 +4779,6 @@ else fi -# Check whether --enable-smartcard was given. -if test "${enable_smartcard+set}" = set; then : - enableval=$enable_smartcard; smartcard_given=true - if test x$enableval = xyes; then - smartcard=true - else - smartcard=false - fi -else - smartcard=false - smartcard_given=false - -fi - - -# Check whether --enable-cisco-quirks was given. -if test "${enable_cisco_quirks+set}" = set; then : - enableval=$enable_cisco_quirks; cisco_quirks_given=true - if test x$enableval = xyes; then - cisco_quirks=true - else - cisco_quirks=false - fi -else - cisco_quirks=false - cisco_quirks_given=false - -fi - - # Check whether --enable-leak-detective was given. if test "${enable_leak_detective+set}" = set; then : enableval=$enable_leak_detective; leak_detective_given=true @@ -4973,6 +5079,21 @@ else fi +# Check whether --enable-eap-dynamic was given. +if test "${enable_eap_dynamic+set}" = set; then : + enableval=$enable_eap_dynamic; eap_dynamic_given=true + if test x$enableval = xyes; then + eap_dynamic=true + else + eap_dynamic=false + fi +else + eap_dynamic=false + eap_dynamic_given=false + +fi + + # Check whether --enable-eap-radius was given. if test "${enable_eap_radius+set}" = set; then : enableval=$enable_eap_radius; eap_radius_given=true @@ -4988,6 +5109,51 @@ else fi +# 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 + xauth_generic=true + else + xauth_generic=false + fi +else + xauth_generic=true + xauth_generic_given=false + +fi + + +# 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 + xauth_eap=true + else + xauth_eap=false + fi +else + xauth_eap=false + xauth_eap_given=false + +fi + + +# 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 + xauth_pam=true + else + xauth_pam=false + fi +else + xauth_pam=false + xauth_pam_given=false + +fi + + # Check whether --enable-tnc-ifmap was given. if test "${enable_tnc_ifmap+set}" = set; then : enableval=$enable_tnc_ifmap; tnc_ifmap_given=true @@ -5243,32 +5409,32 @@ else fi -# Check whether --enable-socket-default was given. -if test "${enable_socket_default+set}" = set; then : - enableval=$enable_socket_default; socket_default_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 - socket_default=true + libipsec=true else - socket_default=false + libipsec=false fi else - socket_default=true - socket_default_given=false + libipsec=false + libipsec_given=false fi -# Check whether --enable-socket-raw was given. -if test "${enable_socket_raw+set}" = set; then : - enableval=$enable_socket_raw; socket_raw_given=true +# Check whether --enable-socket-default was given. +if test "${enable_socket_default+set}" = set; then : + enableval=$enable_socket_default; socket_default_given=true if test x$enableval = xyes; then - socket_raw=true + socket_default=true else - socket_raw=false + socket_default=false fi else - socket_raw=false - socket_raw_given=false + socket_default=true + socket_default_given=false fi @@ -5303,51 +5469,6 @@ else fi -# Check whether --enable-nat-transport was given. -if test "${enable_nat_transport+set}" = set; then : - enableval=$enable_nat_transport; nat_transport_given=true - if test x$enableval = xyes; then - nat_transport=true - else - nat_transport=false - fi -else - nat_transport=false - nat_transport_given=false - -fi - - -# Check whether --enable-vendor-id was given. -if test "${enable_vendor_id+set}" = set; then : - enableval=$enable_vendor_id; vendor_id_given=true - if test x$enableval = xyes; then - vendor_id=true - else - vendor_id=false - fi -else - vendor_id=true - vendor_id_given=false - -fi - - -# Check whether --enable-xauth-vid was given. -if test "${enable_xauth_vid+set}" = set; then : - enableval=$enable_xauth_vid; xauth_vid_given=true - if test x$enableval = xyes; then - xauth_vid=true - else - xauth_vid=false - fi -else - xauth_vid=true - xauth_vid_given=false - -fi - - # Check whether --enable-dumm was given. if test "${enable_dumm+set}" = set; then : enableval=$enable_dumm; dumm_given=true @@ -5438,62 +5559,32 @@ else fi -# Check whether --enable-pluto was given. -if test "${enable_pluto+set}" = set; then : - enableval=$enable_pluto; pluto_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 - pluto=true + ikev1=true else - pluto=false + ikev1=false fi else - pluto=true - pluto_given=false + ikev1=true + ikev1_given=false fi -# Check whether --enable-xauth was given. -if test "${enable_xauth+set}" = set; then : - enableval=$enable_xauth; xauth_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 - xauth=true + ikev2=true else - xauth=false + ikev2=false fi else - xauth=true - xauth_given=false - -fi - - -# Check whether --enable-threads was given. -if test "${enable_threads+set}" = set; then : - enableval=$enable_threads; threads_given=true - if test x$enableval = xyes; then - threads=true - else - threads=false - fi -else - threads=true - threads_given=false - -fi - - -# Check whether --enable-adns was given. -if test "${enable_adns+set}" = set; then : - enableval=$enable_adns; adns_given=true - if test x$enableval = xyes; then - adns=true - else - adns=false - fi -else - adns=true - adns_given=false + ikev2=true + ikev2_given=false fi @@ -5768,6 +5859,21 @@ else fi +# 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 + unity=true + else + unity=false + fi +else + unity=false + unity_given=false + +fi + + # Check whether --enable-uci was given. if test "${enable_uci+set}" = set; then : enableval=$enable_uci; uci_given=true @@ -5798,6 +5904,21 @@ else fi +# 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 + android_log=true + else + android_log=false + fi +else + android_log=false + android_log_given=false + +fi + + # Check whether --enable-maemo was given. if test "${enable_maemo+set}" = set; then : enableval=$enable_maemo; maemo_given=true @@ -5963,6 +6084,21 @@ else fi +# 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 + bfd_backtraces=true + else + bfd_backtraces=false + fi +else + bfd_backtraces=false + bfd_backtraces_given=false + +fi + + if test -z "$CFLAGS"; then @@ -8315,13 +8451,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:8318: $ac_compile\"" >&5) + (eval echo "\"\$as_me:8454: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:8321: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:8457: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:8324: output\"" >&5) + (eval echo "\"\$as_me:8460: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -9526,7 +9662,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 9529 "configure"' > conftest.$ac_ext + echo '#line 9665 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10788,11 +10924,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10791: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10927: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10795: \$? = $ac_status" >&5 + echo "$as_me:10931: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11127,11 +11263,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11130: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11266: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11134: \$? = $ac_status" >&5 + echo "$as_me:11270: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11232,11 +11368,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11235: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11371: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11239: \$? = $ac_status" >&5 + echo "$as_me:11375: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11287,11 +11423,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11290: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11426: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11294: \$? = $ac_status" >&5 + echo "$as_me:11430: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13671,7 +13807,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13674 "configure" +#line 13810 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13767,7 +13903,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13770 "configure" +#line 13906 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14402,6 +14538,10 @@ $as_echo "not found" >&6; } fi +if test x$xauth_generic_given = xfalse -a x$ikev1 = xfalse; then + xauth_generic=false; +fi + if test x$eap_aka_3gpp2 = xtrue; then gmp=true; fi @@ -14463,17 +14603,6 @@ if test x$medcli = xtrue; then mediation=true fi -if test x$pluto = xtrue; then - if test x$socket_raw = xfalse; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Enforcing --enable-socket-raw, as pluto is enabled" >&5 -$as_echo "$as_me: Enforcing --enable-socket-raw, as pluto is enabled" >&6;} - socket_raw=true - if test x$socket_default_given = xfalse; then - socket_default=false - fi - fi -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } @@ -14774,6 +14903,98 @@ _ACEOF fi +ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" +if test "x$ac_cv_have_decl_strerror_r" = x""yes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRERROR_R $ac_have_decl +_ACEOF + +for ac_func in strerror_r +do : + ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r" +if test "x$ac_cv_func_strerror_r" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRERROR_R 1 +_ACEOF + +fi +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5 +$as_echo_n "checking whether strerror_r returns char *... " >&6; } +if test "${ac_cv_func_strerror_r_char_p+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + ac_cv_func_strerror_r_char_p=no + if test $ac_cv_have_decl_strerror_r = yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + + char buf[100]; + char x = *strerror_r (0, buf, sizeof buf); + char *p = strerror_r (0, buf, sizeof buf); + return !p || x; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_func_strerror_r_char_p=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + else + # strerror_r is not declared. Choose between + # systems that have relatively inaccessible declarations for the + # function. BeOS and DEC UNIX 4.0 fall in this category, but the + # former has a strerror_r that returns char*, while the latter + # has a strerror_r that returns `int'. + # This test should segfault on the DEC system. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default + extern char *strerror_r (); +int +main () +{ +char buf[100]; + char x = *strerror_r (0, buf, sizeof buf); + return ! isalpha (x); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_strerror_r_char_p=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5 +$as_echo "$ac_cv_func_strerror_r_char_p" >&6; } +if test $ac_cv_func_strerror_r_char_p = yes; then + +$as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h + +fi + saved_LIBS=$LIBS @@ -15155,7 +15376,8 @@ Dl_info* info = 0; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_DLADDR 1" >>confdefs.h +$as_echo "yes" >&6; }; +$as_echo "#define HAVE_DLADDR /**/" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -15178,7 +15400,8 @@ if test "x$ac_cv_func_pthread_condattr_setclock" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_PTHREAD_CONDATTR_SETCLOCK 1 _ACEOF - $as_echo "#define HAVE_CONDATTR_CLOCK_MONOTONIC 1" >>confdefs.h + +$as_echo "#define HAVE_CONDATTR_CLOCK_MONOTONIC /**/" >>confdefs.h fi @@ -15195,7 +15418,9 @@ else _ACEOF if ac_fn_c_try_run "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_CONDATTR_CLOCK_MONOTONIC 1" >>confdefs.h +$as_echo "yes" >&6; }; + +$as_echo "#define HAVE_CONDATTR_CLOCK_MONOTONIC /**/" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -15249,11 +15474,23 @@ _ACEOF fi done +for ac_func in sem_timedwait +do : + ac_fn_c_check_func "$LINENO" "sem_timedwait" "ac_cv_func_sem_timedwait" +if test "x$ac_cv_func_sem_timedwait" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SEM_TIMEDWAIT 1 +_ACEOF + +fi +done + LIBS=$saved_LIBS ac_fn_c_check_func "$LINENO" "gettid" "ac_cv_func_gettid" if test "x$ac_cv_func_gettid" = x""yes; then : - $as_echo "#define HAVE_GETTID 1" >>confdefs.h + +$as_echo "#define HAVE_GETTID /**/" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYS_gettid" >&5 @@ -15274,9 +15511,12 @@ int main() { _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_GETTID 1" >>confdefs.h +$as_echo "yes" >&6; }; + +$as_echo "#define HAVE_GETTID /**/" >>confdefs.h - $as_echo "#define HAVE_SYS_GETTID 1" >>confdefs.h + +$as_echo "#define HAVE_SYS_GETTID /**/" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -15288,7 +15528,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -for ac_func in prctl mallinfo getpass closefrom +for ac_func in prctl mallinfo getpass closefrom getpwnam_r getgrnam_r do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -15327,6 +15567,18 @@ fi done +for ac_header in netinet/ip6.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "netinet/ip6.h" "ac_cv_header_netinet_ip6_h" "$ac_includes_default" +if test "x$ac_cv_header_netinet_ip6_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NETINET_IP6_H 1 +_ACEOF + +fi + +done + ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" " #include <sys/types.h> @@ -15381,7 +15633,9 @@ struct in6_addr in6; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_IN6ADDR_ANY 1" >>confdefs.h +$as_echo "yes" >&6; }; + +$as_echo "#define HAVE_IN6ADDR_ANY /**/" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -15412,7 +15666,9 @@ struct in6_pktinfo pi; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_IN6_PKTINFO 1" >>confdefs.h +$as_echo "yes" >&6; }; + +$as_echo "#define HAVE_IN6_PKTINFO /**/" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -15445,7 +15701,9 @@ int mode = IPSEC_MODE_BEET; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_IPSEC_MODE_BEET 1" >>confdefs.h +$as_echo "yes" >&6; }; + +$as_echo "#define HAVE_IPSEC_MODE_BEET /**/" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -15478,7 +15736,9 @@ int dir = IPSEC_DIR_FWD; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_IPSEC_DIR_FWD 1" >>confdefs.h +$as_echo "yes" >&6; }; + +$as_echo "#define HAVE_IPSEC_DIR_FWD /**/" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -15505,7 +15765,9 @@ int rta_type = RTA_TABLE; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_RTA_TABLE 1" >>confdefs.h +$as_echo "yes" >&6; }; + +$as_echo "#define HAVE_RTA_TABLE /**/" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -15535,7 +15797,9 @@ else _ACEOF if ac_fn_c_try_run "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_GCC_ATOMIC_OPERATIONS 1" >>confdefs.h +$as_echo "yes" >&6; }; + +$as_echo "#define HAVE_GCC_ATOMIC_OPERATIONS /**/" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -15548,12 +15812,14 @@ fi ac_fn_c_check_func "$LINENO" "register_printf_specifier" "ac_cv_func_register_printf_specifier" if test "x$ac_cv_func_register_printf_specifier" = x""yes; then : - $as_echo "#define HAVE_PRINTF_SPECIFIER 1" >>confdefs.h + +$as_echo "#define HAVE_PRINTF_SPECIFIER /**/" >>confdefs.h else ac_fn_c_check_func "$LINENO" "register_printf_function" "ac_cv_func_register_printf_function" if test "x$ac_cv_func_register_printf_function" = x""yes; then : - $as_echo "#define HAVE_PRINTF_FUNCTION 1" >>confdefs.h + +$as_echo "#define HAVE_PRINTF_FUNCTION /**/" >>confdefs.h else @@ -15606,7 +15872,8 @@ else fi ac_cv_lib_vstr=ac_cv_lib_vstr_main - $as_echo "#define USE_VSTR 1" >>confdefs.h + +$as_echo "#define USE_VSTR /**/" >>confdefs.h fi @@ -15672,7 +15939,9 @@ main () _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_MPZ_POWM_SEC 1" >>confdefs.h +$as_echo "yes" >&6; }; + +$as_echo "#define HAVE_MPZ_POWM_SEC /**/" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -16606,9 +16875,9 @@ main () _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; cat >>confdefs.h <<_ACEOF -#define HAVE_SQLITE3_PREPARE_V2 1 -_ACEOF +$as_echo "yes" >&6; }; + +$as_echo "#define HAVE_SQLITE3_PREPARE_V2 /**/" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -16751,7 +17020,9 @@ enum gcry_cipher_algos alg = GCRY_CIPHER_CAMELLIA128; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_GCRY_CIPHER_CAMELLIA 1" >>confdefs.h +$as_echo "yes" >&6; }; + +$as_echo "#define HAVE_GCRY_CIPHER_CAMELLIA /**/" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -17065,12 +17336,12 @@ if test -n "$nm_CFLAGS"; then pkg_cv_nm_CFLAGS="$nm_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn\""; } >&5 - ($PKG_CONFIG --exists --print-errors "NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager gthread-2.0 libnm-util libnm-glib libnm-glib-vpn\""; } >&5 + ($PKG_CONFIG --exists --print-errors "NetworkManager gthread-2.0 libnm-util libnm-glib libnm-glib-vpn") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_nm_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn" 2>/dev/null` + pkg_cv_nm_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager gthread-2.0 libnm-util libnm-glib libnm-glib-vpn" 2>/dev/null` else pkg_failed=yes fi @@ -17081,12 +17352,12 @@ if test -n "$nm_LIBS"; then pkg_cv_nm_LIBS="$nm_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn\""; } >&5 - ($PKG_CONFIG --exists --print-errors "NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager gthread-2.0 libnm-util libnm-glib libnm-glib-vpn\""; } >&5 + ($PKG_CONFIG --exists --print-errors "NetworkManager gthread-2.0 libnm-util libnm-glib libnm-glib-vpn") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_nm_LIBS=`$PKG_CONFIG --libs "NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn" 2>/dev/null` + pkg_cv_nm_LIBS=`$PKG_CONFIG --libs "NetworkManager gthread-2.0 libnm-util libnm-glib libnm-glib-vpn" 2>/dev/null` else pkg_failed=yes fi @@ -17106,14 +17377,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - nm_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn" 2>&1` + nm_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager gthread-2.0 libnm-util libnm-glib libnm-glib-vpn" 2>&1` else - nm_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn" 2>&1` + nm_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager gthread-2.0 libnm-util libnm-glib libnm-glib-vpn" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$nm_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn) were not met: + as_fn_error $? "Package requirements (NetworkManager gthread-2.0 libnm-util libnm-glib libnm-glib-vpn) were not met: $nm_PKG_ERRORS @@ -17155,12 +17426,12 @@ if test -n "$nm_CFLAGS"; then pkg_cv_nm_CFLAGS="$nm_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn\""; } >&5 - ($PKG_CONFIG --exists --print-errors "NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager gthread-2.0 libnm_util libnm_glib libnm_glib_vpn\""; } >&5 + ($PKG_CONFIG --exists --print-errors "NetworkManager gthread-2.0 libnm_util libnm_glib libnm_glib_vpn") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_nm_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn" 2>/dev/null` + pkg_cv_nm_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager gthread-2.0 libnm_util libnm_glib libnm_glib_vpn" 2>/dev/null` else pkg_failed=yes fi @@ -17171,12 +17442,12 @@ if test -n "$nm_LIBS"; then pkg_cv_nm_LIBS="$nm_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn\""; } >&5 - ($PKG_CONFIG --exists --print-errors "NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager gthread-2.0 libnm_util libnm_glib libnm_glib_vpn\""; } >&5 + ($PKG_CONFIG --exists --print-errors "NetworkManager gthread-2.0 libnm_util libnm_glib libnm_glib_vpn") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_nm_LIBS=`$PKG_CONFIG --libs "NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn" 2>/dev/null` + pkg_cv_nm_LIBS=`$PKG_CONFIG --libs "NetworkManager gthread-2.0 libnm_util libnm_glib libnm_glib_vpn" 2>/dev/null` else pkg_failed=yes fi @@ -17196,14 +17467,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - nm_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn" 2>&1` + nm_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager gthread-2.0 libnm_util libnm_glib libnm_glib_vpn" 2>&1` else - nm_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn" 2>&1` + nm_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager gthread-2.0 libnm_util libnm_glib libnm_glib_vpn" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$nm_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn) were not met: + as_fn_error $? "Package requirements (NetworkManager gthread-2.0 libnm_util libnm_glib libnm_glib_vpn) were not met: $nm_PKG_ERRORS @@ -17241,7 +17512,7 @@ fi fi -if test x$eap_gtc = xtrue; then +if test x$xauth_pam = xtrue; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpam" >&5 $as_echo_n "checking for main in -lpam... " >&6; } if test "${ac_cv_lib_pam_main+set}" = set; then : @@ -17311,7 +17582,8 @@ else as_fn_error $? "capset() not found!" "$LINENO" 5 fi - $as_echo "#define CAPABILITIES_NATIVE 1" >>confdefs.h + +$as_echo "#define CAPABILITIES_NATIVE /**/" >>confdefs.h fi @@ -17355,14 +17627,16 @@ ac_cv_lib_cap=ac_cv_lib_cap_main ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default" if test "x$ac_cv_header_sys_capability_h" = x""yes; then : - $as_echo "#define HAVE_SYS_CAPABILITY_H 1" >>confdefs.h + +$as_echo "#define HAVE_SYS_CAPABILITY_H /**/" >>confdefs.h else as_fn_error $? "libcap header sys/capability.h not found!" "$LINENO" 5 fi - $as_echo "#define CAPABILITIES_LIBCAP 1" >>confdefs.h + +$as_echo "#define CAPABILITIES_LIBCAP /**/" >>confdefs.h fi @@ -17417,6 +17691,73 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +if test x$bfd_backtraces = xtrue; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lbfd" >&5 +$as_echo_n "checking for main in -lbfd... " >&6; } +if test "${ac_cv_lib_bfd_main+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbfd $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bfd_main=yes +else + ac_cv_lib_bfd_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_main" >&5 +$as_echo "$ac_cv_lib_bfd_main" >&6; } +if test "x$ac_cv_lib_bfd_main" = x""yes; then : + LIBS="$LIBS" +else + as_fn_error $? "binutils libbfd not found!" "$LINENO" 5 +fi +ac_cv_lib_bfd=ac_cv_lib_bfd_main + + ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default" +if test "x$ac_cv_header_bfd_h" = x""yes; then : + +$as_echo "#define HAVE_BFD_H /**/" >>confdefs.h + +else + as_fn_error $? "binutils bfd.h header not found!" "$LINENO" 5 +fi + + + BFDLIB="-lbfd" + +fi + + if test "x$dev_headers" != xno; then + USE_DEV_HEADERS_TRUE= + USE_DEV_HEADERS_FALSE='#' +else + USE_DEV_HEADERS_TRUE='#' + USE_DEV_HEADERS_FALSE= +fi + +if test x$dev_headers = xyes; then + dev_headers="$includedir/strongswan" +fi + + +CFLAGS="$CFLAGS -include `pwd`/config.h" + # ADD_PLUGIN(plugin, category list) # ----------------------------------- @@ -17425,8 +17766,7 @@ fi # plugin lists for all components -libcharon_plugins= -pluto_plugins= +charon_plugins= starter_plugins= pool_plugins= attest_plugins= @@ -17436,18 +17776,17 @@ pki_plugins= scripts_plugins= manager_plugins= medsrv_plugins= +nm_plugins= # location specific lists for checksumming, -# for src/libcharon, src/pluto, src/libhydra and src/libstrongswan +# for src/libcharon, src/libhydra and src/libstrongswan c_plugins= -p_plugins= h_plugins= s_plugins= if test x$test_vectors = xtrue; then s_plugins=${s_plugins}" test-vectors" - libcharon_plugins=${libcharon_plugins}" test-vectors" - pluto_plugins=${pluto_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" @@ -17456,34 +17795,33 @@ if test x$test_vectors = xtrue; then if test x$curl = xtrue; then s_plugins=${s_plugins}" curl" - libcharon_plugins=${libcharon_plugins}" curl" - pluto_plugins=${pluto_plugins}" curl" + charon_plugins=${charon_plugins}" curl" scepclient_plugins=${scepclient_plugins}" curl" scripts_plugins=${scripts_plugins}" curl" + nm_plugins=${nm_plugins}" curl" fi if test x$soup = xtrue; then s_plugins=${s_plugins}" soup" - libcharon_plugins=${libcharon_plugins}" soup" - pluto_plugins=${pluto_plugins}" soup" + charon_plugins=${charon_plugins}" soup" scripts_plugins=${scripts_plugins}" soup" + nm_plugins=${nm_plugins}" soup" fi if test x$ldap = xtrue; then s_plugins=${s_plugins}" ldap" - libcharon_plugins=${libcharon_plugins}" ldap" - pluto_plugins=${pluto_plugins}" ldap" + charon_plugins=${charon_plugins}" ldap" scepclient_plugins=${scepclient_plugins}" ldap" scripts_plugins=${scripts_plugins}" ldap" + nm_plugins=${nm_plugins}" ldap" fi if test x$mysql = xtrue; then s_plugins=${s_plugins}" mysql" - libcharon_plugins=${libcharon_plugins}" mysql" - pluto_plugins=${pluto_plugins}" mysql" + charon_plugins=${charon_plugins}" mysql" pool_plugins=${pool_plugins}" mysql" manager_plugins=${manager_plugins}" mysql" medsrv_plugins=${medsrv_plugins}" mysql" @@ -17493,8 +17831,7 @@ if test x$mysql = xtrue; then if test x$sqlite = xtrue; then s_plugins=${s_plugins}" sqlite" - libcharon_plugins=${libcharon_plugins}" sqlite" - pluto_plugins=${pluto_plugins}" sqlite" + charon_plugins=${charon_plugins}" sqlite" pool_plugins=${pool_plugins}" sqlite" manager_plugins=${manager_plugins}" sqlite" medsrv_plugins=${medsrv_plugins}" sqlite" @@ -17504,139 +17841,149 @@ if test x$sqlite = xtrue; then if test x$pkcs11 = xtrue; then s_plugins=${s_plugins}" pkcs11" - libcharon_plugins=${libcharon_plugins}" pkcs11" + charon_plugins=${charon_plugins}" pkcs11" pki_plugins=${pki_plugins}" pkcs11" + nm_plugins=${nm_plugins}" pkcs11" fi if test x$aes = xtrue; then s_plugins=${s_plugins}" aes" - libcharon_plugins=${libcharon_plugins}" aes" - pluto_plugins=${pluto_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" + nm_plugins=${nm_plugins}" aes" fi if test x$des = xtrue; then s_plugins=${s_plugins}" des" - libcharon_plugins=${libcharon_plugins}" des" - pluto_plugins=${pluto_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" + nm_plugins=${nm_plugins}" des" fi if test x$blowfish = xtrue; then s_plugins=${s_plugins}" blowfish" - libcharon_plugins=${libcharon_plugins}" blowfish" - pluto_plugins=${pluto_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" + nm_plugins=${nm_plugins}" blowfish" fi if test x$sha1 = xtrue; then s_plugins=${s_plugins}" sha1" - libcharon_plugins=${libcharon_plugins}" sha1" - pluto_plugins=${pluto_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" medsrv_plugins=${medsrv_plugins}" sha1" attest_plugins=${attest_plugins}" sha1" + nm_plugins=${nm_plugins}" sha1" fi if test x$sha2 = xtrue; then s_plugins=${s_plugins}" sha2" - libcharon_plugins=${libcharon_plugins}" sha2" - pluto_plugins=${pluto_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" medsrv_plugins=${medsrv_plugins}" sha2" attest_plugins=${attest_plugins}" sha2" + nm_plugins=${nm_plugins}" sha2" fi if test x$md4 = xtrue; then s_plugins=${s_plugins}" md4" - libcharon_plugins=${libcharon_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" + nm_plugins=${nm_plugins}" md4" fi if test x$md5 = xtrue; then s_plugins=${s_plugins}" md5" - libcharon_plugins=${libcharon_plugins}" md5" - pluto_plugins=${pluto_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" attest_plugins=${attest_plugins}" md5" + nm_plugins=${nm_plugins}" md5" fi if test x$random = xtrue; then s_plugins=${s_plugins}" random" - libcharon_plugins=${libcharon_plugins}" random" - pluto_plugins=${pluto_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" medsrv_plugins=${medsrv_plugins}" random" attest_plugins=${attest_plugins}" random" + nm_plugins=${nm_plugins}" random" + + fi + +if test x$nonce = xtrue; then + s_plugins=${s_plugins}" nonce" + charon_plugins=${charon_plugins}" nonce" + nm_plugins=${nm_plugins}" nonce" fi if test x$x509 = xtrue; then s_plugins=${s_plugins}" x509" - libcharon_plugins=${libcharon_plugins}" x509" - pluto_plugins=${pluto_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" attest_plugins=${attest_plugins}" x509" + nm_plugins=${nm_plugins}" x509" fi if test x$revocation = xtrue; then s_plugins=${s_plugins}" revocation" - libcharon_plugins=${libcharon_plugins}" revocation" + charon_plugins=${charon_plugins}" revocation" + nm_plugins=${nm_plugins}" revocation" fi if test x$constraints = xtrue; then s_plugins=${s_plugins}" constraints" - libcharon_plugins=${libcharon_plugins}" constraints" + charon_plugins=${charon_plugins}" constraints" + nm_plugins=${nm_plugins}" constraints" fi if test x$pubkey = xtrue; then s_plugins=${s_plugins}" pubkey" - libcharon_plugins=${libcharon_plugins}" pubkey" + charon_plugins=${charon_plugins}" pubkey" fi if test x$pkcs1 = xtrue; then s_plugins=${s_plugins}" pkcs1" - libcharon_plugins=${libcharon_plugins}" pkcs1" - pluto_plugins=${pluto_plugins}" pkcs1" + charon_plugins=${charon_plugins}" pkcs1" openac_plugins=${openac_plugins}" pkcs1" scepclient_plugins=${scepclient_plugins}" pkcs1" pki_plugins=${pki_plugins}" pkcs1" @@ -17644,13 +17991,13 @@ if test x$pkcs1 = xtrue; then manager_plugins=${manager_plugins}" pkcs1" medsrv_plugins=${medsrv_plugins}" pkcs1" attest_plugins=${attest_plugins}" pkcs1" + nm_plugins=${nm_plugins}" pkcs1" fi if test x$pkcs8 = xtrue; then s_plugins=${s_plugins}" pkcs8" - libcharon_plugins=${libcharon_plugins}" pkcs8" - pluto_plugins=${pluto_plugins}" pkcs8" + charon_plugins=${charon_plugins}" pkcs8" openac_plugins=${openac_plugins}" pkcs8" scepclient_plugins=${scepclient_plugins}" pkcs8" pki_plugins=${pki_plugins}" pkcs8" @@ -17658,26 +18005,25 @@ if test x$pkcs8 = xtrue; then manager_plugins=${manager_plugins}" pkcs8" medsrv_plugins=${medsrv_plugins}" pkcs8" attest_plugins=${attest_plugins}" pkcs8" + nm_plugins=${nm_plugins}" pkcs8" fi if test x$pgp = xtrue; then s_plugins=${s_plugins}" pgp" - libcharon_plugins=${libcharon_plugins}" pgp" - pluto_plugins=${pluto_plugins}" pgp" + charon_plugins=${charon_plugins}" pgp" fi if test x$dnskey = xtrue; then s_plugins=${s_plugins}" dnskey" - pluto_plugins=${pluto_plugins}" dnskey" + charon_plugins=${charon_plugins}" dnskey" fi if test x$pem = xtrue; then s_plugins=${s_plugins}" pem" - libcharon_plugins=${libcharon_plugins}" pem" - pluto_plugins=${pluto_plugins}" pem" + charon_plugins=${charon_plugins}" pem" openac_plugins=${openac_plugins}" pem" scepclient_plugins=${scepclient_plugins}" pem" pki_plugins=${pki_plugins}" pem" @@ -17685,19 +18031,19 @@ if test x$pem = xtrue; then manager_plugins=${manager_plugins}" pem" medsrv_plugins=${medsrv_plugins}" pem" attest_plugins=${attest_plugins}" pem" + nm_plugins=${nm_plugins}" pem" fi if test x$padlock = xtrue; then s_plugins=${s_plugins}" padlock" - libcharon_plugins=${libcharon_plugins}" padlock" + charon_plugins=${charon_plugins}" padlock" fi if test x$openssl = xtrue; then s_plugins=${s_plugins}" openssl" - libcharon_plugins=${libcharon_plugins}" openssl" - pluto_plugins=${pluto_plugins}" openssl" + charon_plugins=${charon_plugins}" openssl" openac_plugins=${openac_plugins}" openssl" scepclient_plugins=${scepclient_plugins}" openssl" pki_plugins=${pki_plugins}" openssl" @@ -17705,13 +18051,13 @@ if test x$openssl = xtrue; then manager_plugins=${manager_plugins}" openssl" medsrv_plugins=${medsrv_plugins}" openssl" attest_plugins=${attest_plugins}" openssl" + nm_plugins=${nm_plugins}" openssl" fi if test x$gcrypt = xtrue; then s_plugins=${s_plugins}" gcrypt" - libcharon_plugins=${libcharon_plugins}" gcrypt" - pluto_plugins=${pluto_plugins}" gcrypt" + charon_plugins=${charon_plugins}" gcrypt" openac_plugins=${openac_plugins}" gcrypt" scepclient_plugins=${scepclient_plugins}" gcrypt" pki_plugins=${pki_plugins}" gcrypt" @@ -17719,32 +18065,33 @@ if test x$gcrypt = xtrue; then manager_plugins=${manager_plugins}" gcrypt" medsrv_plugins=${medsrv_plugins}" gcrypt" attest_plugins=${attest_plugins}" gcrypt" + nm_plugins=${nm_plugins}" gcrypt" fi if test x$af_alg = xtrue; then s_plugins=${s_plugins}" af-alg" - libcharon_plugins=${libcharon_plugins}" af-alg" - pluto_plugins=${pluto_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" medsrv_plugins=${medsrv_plugins}" af-alg" attest_plugins=${attest_plugins}" af-alg" + nm_plugins=${nm_plugins}" af-alg" fi if test x$fips_prf = xtrue; then s_plugins=${s_plugins}" fips-prf" - libcharon_plugins=${libcharon_plugins}" fips-prf" + charon_plugins=${charon_plugins}" fips-prf" + nm_plugins=${nm_plugins}" fips-prf" fi if test x$gmp = xtrue; then s_plugins=${s_plugins}" gmp" - libcharon_plugins=${libcharon_plugins}" gmp" - pluto_plugins=${pluto_plugins}" gmp" + charon_plugins=${charon_plugins}" gmp" openac_plugins=${openac_plugins}" gmp" scepclient_plugins=${scepclient_plugins}" gmp" pki_plugins=${pki_plugins}" gmp" @@ -17752,412 +18099,441 @@ if test x$gmp = xtrue; then manager_plugins=${manager_plugins}" gmp" medsrv_plugins=${medsrv_plugins}" gmp" attest_plugins=${attest_plugins}" gmp" + nm_plugins=${nm_plugins}" gmp" fi if test x$agent = xtrue; then s_plugins=${s_plugins}" agent" - libcharon_plugins=${libcharon_plugins}" agent" + charon_plugins=${charon_plugins}" agent" + nm_plugins=${nm_plugins}" agent" fi if test x$xcbc = xtrue; then s_plugins=${s_plugins}" xcbc" - libcharon_plugins=${libcharon_plugins}" xcbc" + charon_plugins=${charon_plugins}" xcbc" + nm_plugins=${nm_plugins}" xcbc" fi if test x$cmac = xtrue; then s_plugins=${s_plugins}" cmac" - libcharon_plugins=${libcharon_plugins}" cmac" + charon_plugins=${charon_plugins}" cmac" + nm_plugins=${nm_plugins}" cmac" fi if test x$hmac = xtrue; then s_plugins=${s_plugins}" hmac" - libcharon_plugins=${libcharon_plugins}" hmac" - pluto_plugins=${pluto_plugins}" hmac" + charon_plugins=${charon_plugins}" hmac" scripts_plugins=${scripts_plugins}" hmac" + nm_plugins=${nm_plugins}" hmac" fi if test x$ctr = xtrue; then s_plugins=${s_plugins}" ctr" - libcharon_plugins=${libcharon_plugins}" ctr" + charon_plugins=${charon_plugins}" ctr" scripts_plugins=${scripts_plugins}" ctr" + nm_plugins=${nm_plugins}" ctr" fi if test x$ccm = xtrue; then s_plugins=${s_plugins}" ccm" - libcharon_plugins=${libcharon_plugins}" ccm" + charon_plugins=${charon_plugins}" ccm" scripts_plugins=${scripts_plugins}" ccm" + nm_plugins=${nm_plugins}" ccm" fi if test x$gcm = xtrue; then s_plugins=${s_plugins}" gcm" - libcharon_plugins=${libcharon_plugins}" gcm" + charon_plugins=${charon_plugins}" gcm" scripts_plugins=${scripts_plugins}" gcm" - - fi - -if test x$xauth = xtrue; then - p_plugins=${p_plugins}" xauth" - pluto_plugins=${pluto_plugins}" xauth" + nm_plugins=${nm_plugins}" gcm" fi if test x$attr = xtrue; then h_plugins=${h_plugins}" attr" - libcharon_plugins=${libcharon_plugins}" attr" - pluto_plugins=${pluto_plugins}" attr" + charon_plugins=${charon_plugins}" attr" fi if test x$attr_sql = xtrue; then h_plugins=${h_plugins}" attr-sql" - libcharon_plugins=${libcharon_plugins}" attr-sql" - pluto_plugins=${pluto_plugins}" attr-sql" + charon_plugins=${charon_plugins}" attr-sql" fi if test x$load_tester = xtrue; then c_plugins=${c_plugins}" load-tester" - libcharon_plugins=${libcharon_plugins}" load-tester" + charon_plugins=${charon_plugins}" load-tester" fi if test x$kernel_pfkey = xtrue; then h_plugins=${h_plugins}" kernel-pfkey" - libcharon_plugins=${libcharon_plugins}" kernel-pfkey" - pluto_plugins=${pluto_plugins}" kernel-pfkey" + charon_plugins=${charon_plugins}" kernel-pfkey" starter_plugins=${starter_plugins}" kernel-pfkey" + nm_plugins=${nm_plugins}" kernel-pfkey" fi if test x$kernel_pfroute = xtrue; then h_plugins=${h_plugins}" kernel-pfroute" - libcharon_plugins=${libcharon_plugins}" kernel-pfroute" - pluto_plugins=${pluto_plugins}" kernel-pfroute" + charon_plugins=${charon_plugins}" kernel-pfroute" starter_plugins=${starter_plugins}" kernel-pfroute" + nm_plugins=${nm_plugins}" kernel-pfroute" fi if test x$kernel_klips = xtrue; then h_plugins=${h_plugins}" kernel-klips" - libcharon_plugins=${libcharon_plugins}" kernel-klips" - pluto_plugins=${pluto_plugins}" kernel-klips" + charon_plugins=${charon_plugins}" kernel-klips" starter_plugins=${starter_plugins}" kernel-klips" fi if test x$kernel_netlink = xtrue; then h_plugins=${h_plugins}" kernel-netlink" - libcharon_plugins=${libcharon_plugins}" kernel-netlink" - pluto_plugins=${pluto_plugins}" kernel-netlink" + charon_plugins=${charon_plugins}" kernel-netlink" starter_plugins=${starter_plugins}" kernel-netlink" + nm_plugins=${nm_plugins}" kernel-netlink" fi if test x$resolve = xtrue; then h_plugins=${h_plugins}" resolve" - libcharon_plugins=${libcharon_plugins}" resolve" - pluto_plugins=${pluto_plugins}" resolve" + charon_plugins=${charon_plugins}" resolve" fi if test x$socket_default = xtrue; then c_plugins=${c_plugins}" socket-default" - libcharon_plugins=${libcharon_plugins}" socket-default" - - fi - -if test x$socket_raw = xtrue; then - c_plugins=${c_plugins}" socket-raw" - libcharon_plugins=${libcharon_plugins}" socket-raw" + charon_plugins=${charon_plugins}" socket-default" + nm_plugins=${nm_plugins}" socket-default" fi if test x$socket_dynamic = xtrue; then c_plugins=${c_plugins}" socket-dynamic" - libcharon_plugins=${libcharon_plugins}" socket-dynamic" + charon_plugins=${charon_plugins}" socket-dynamic" fi if test x$farp = xtrue; then c_plugins=${c_plugins}" farp" - libcharon_plugins=${libcharon_plugins}" farp" + charon_plugins=${charon_plugins}" farp" fi if test x$stroke = xtrue; then c_plugins=${c_plugins}" stroke" - libcharon_plugins=${libcharon_plugins}" stroke" + charon_plugins=${charon_plugins}" stroke" fi if test x$smp = xtrue; then c_plugins=${c_plugins}" smp" - libcharon_plugins=${libcharon_plugins}" smp" + charon_plugins=${charon_plugins}" smp" fi if test x$sql = xtrue; then c_plugins=${c_plugins}" sql" - libcharon_plugins=${libcharon_plugins}" sql" + charon_plugins=${charon_plugins}" sql" fi if test x$updown = xtrue; then c_plugins=${c_plugins}" updown" - libcharon_plugins=${libcharon_plugins}" updown" + charon_plugins=${charon_plugins}" updown" fi if test x$eap_identity = xtrue; then c_plugins=${c_plugins}" eap-identity" - libcharon_plugins=${libcharon_plugins}" eap-identity" + charon_plugins=${charon_plugins}" eap-identity" + nm_plugins=${nm_plugins}" eap-identity" fi if test x$eap_sim = xtrue; then c_plugins=${c_plugins}" eap-sim" - libcharon_plugins=${libcharon_plugins}" eap-sim" + charon_plugins=${charon_plugins}" eap-sim" fi if test x$eap_sim_file = xtrue; then c_plugins=${c_plugins}" eap-sim-file" - libcharon_plugins=${libcharon_plugins}" eap-sim-file" + charon_plugins=${charon_plugins}" eap-sim-file" fi if test x$eap_sim_pcsc = xtrue; then c_plugins=${c_plugins}" eap-sim-pcsc" - libcharon_plugins=${libcharon_plugins}" eap-sim-pcsc" + charon_plugins=${charon_plugins}" eap-sim-pcsc" fi if test x$eap_aka = xtrue; then c_plugins=${c_plugins}" eap-aka" - libcharon_plugins=${libcharon_plugins}" eap-aka" + charon_plugins=${charon_plugins}" eap-aka" fi if test x$eap_aka_3gpp2 = xtrue; then c_plugins=${c_plugins}" eap-aka-3gpp2" - libcharon_plugins=${libcharon_plugins}" eap-aka-3gpp2" + charon_plugins=${charon_plugins}" eap-aka-3gpp2" fi if test x$eap_simaka_sql = xtrue; then c_plugins=${c_plugins}" eap-simaka-sql" - libcharon_plugins=${libcharon_plugins}" eap-simaka-sql" + charon_plugins=${charon_plugins}" eap-simaka-sql" fi if test x$eap_simaka_pseudonym = xtrue; then c_plugins=${c_plugins}" eap-simaka-pseudonym" - libcharon_plugins=${libcharon_plugins}" eap-simaka-pseudonym" + charon_plugins=${charon_plugins}" eap-simaka-pseudonym" fi if test x$eap_simaka_reauth = xtrue; then c_plugins=${c_plugins}" eap-simaka-reauth" - libcharon_plugins=${libcharon_plugins}" eap-simaka-reauth" + charon_plugins=${charon_plugins}" eap-simaka-reauth" fi if test x$eap_md5 = xtrue; then c_plugins=${c_plugins}" eap-md5" - libcharon_plugins=${libcharon_plugins}" eap-md5" + charon_plugins=${charon_plugins}" eap-md5" + nm_plugins=${nm_plugins}" eap-md5" fi if test x$eap_gtc = xtrue; then c_plugins=${c_plugins}" eap-gtc" - libcharon_plugins=${libcharon_plugins}" eap-gtc" + charon_plugins=${charon_plugins}" eap-gtc" + nm_plugins=${nm_plugins}" eap-gtc" fi if test x$eap_mschapv2 = xtrue; then c_plugins=${c_plugins}" eap-mschapv2" - libcharon_plugins=${libcharon_plugins}" eap-mschapv2" + charon_plugins=${charon_plugins}" eap-mschapv2" + nm_plugins=${nm_plugins}" eap-mschapv2" + + fi + +if test x$eap_dynamic = xtrue; then + c_plugins=${c_plugins}" eap-dynamic" + charon_plugins=${charon_plugins}" eap-dynamic" fi if test x$eap_radius = xtrue; then c_plugins=${c_plugins}" eap-radius" - libcharon_plugins=${libcharon_plugins}" eap-radius" + charon_plugins=${charon_plugins}" eap-radius" fi if test x$eap_tls = xtrue; then c_plugins=${c_plugins}" eap-tls" - libcharon_plugins=${libcharon_plugins}" eap-tls" + charon_plugins=${charon_plugins}" eap-tls" + nm_plugins=${nm_plugins}" eap-tls" fi if test x$eap_ttls = xtrue; then c_plugins=${c_plugins}" eap-ttls" - libcharon_plugins=${libcharon_plugins}" eap-ttls" + charon_plugins=${charon_plugins}" eap-ttls" + nm_plugins=${nm_plugins}" eap-ttls" fi if test x$eap_peap = xtrue; then c_plugins=${c_plugins}" eap-peap" - libcharon_plugins=${libcharon_plugins}" eap-peap" + charon_plugins=${charon_plugins}" eap-peap" + nm_plugins=${nm_plugins}" eap-peap" fi if test x$eap_tnc = xtrue; then c_plugins=${c_plugins}" eap-tnc" - libcharon_plugins=${libcharon_plugins}" eap-tnc" + charon_plugins=${charon_plugins}" eap-tnc" + + fi + +if test x$xauth_generic = xtrue; then + c_plugins=${c_plugins}" xauth-generic" + charon_plugins=${charon_plugins}" xauth-generic" + + fi + +if test x$xauth_eap = xtrue; then + c_plugins=${c_plugins}" xauth-eap" + charon_plugins=${charon_plugins}" xauth-eap" + + fi + +if test x$xauth_pam = xtrue; then + c_plugins=${c_plugins}" xauth-pam" + charon_plugins=${charon_plugins}" xauth-pam" fi if test x$tnc_ifmap = xtrue; then c_plugins=${c_plugins}" tnc-ifmap" - libcharon_plugins=${libcharon_plugins}" tnc-ifmap" + charon_plugins=${charon_plugins}" tnc-ifmap" fi if test x$tnc_pdp = xtrue; then c_plugins=${c_plugins}" tnc-pdp" - libcharon_plugins=${libcharon_plugins}" tnc-pdp" + charon_plugins=${charon_plugins}" tnc-pdp" fi if test x$tnc_imc = xtrue; then c_plugins=${c_plugins}" tnc-imc" - libcharon_plugins=${libcharon_plugins}" tnc-imc" + charon_plugins=${charon_plugins}" tnc-imc" fi if test x$tnc_imv = xtrue; then c_plugins=${c_plugins}" tnc-imv" - libcharon_plugins=${libcharon_plugins}" tnc-imv" + charon_plugins=${charon_plugins}" tnc-imv" fi if test x$tnc_tnccs = xtrue; then c_plugins=${c_plugins}" tnc-tnccs" - libcharon_plugins=${libcharon_plugins}" tnc-tnccs" + charon_plugins=${charon_plugins}" tnc-tnccs" fi if test x$tnccs_20 = xtrue; then c_plugins=${c_plugins}" tnccs-20" - libcharon_plugins=${libcharon_plugins}" tnccs-20" + charon_plugins=${charon_plugins}" tnccs-20" fi if test x$tnccs_11 = xtrue; then c_plugins=${c_plugins}" tnccs-11" - libcharon_plugins=${libcharon_plugins}" tnccs-11" + charon_plugins=${charon_plugins}" tnccs-11" fi if test x$tnccs_dynamic = xtrue; then c_plugins=${c_plugins}" tnccs-dynamic" - libcharon_plugins=${libcharon_plugins}" tnccs-dynamic" + charon_plugins=${charon_plugins}" tnccs-dynamic" fi if test x$medsrv = xtrue; then c_plugins=${c_plugins}" medsrv" - libcharon_plugins=${libcharon_plugins}" medsrv" + charon_plugins=${charon_plugins}" medsrv" fi if test x$medcli = xtrue; then c_plugins=${c_plugins}" medcli" - libcharon_plugins=${libcharon_plugins}" medcli" - - fi - -if test x$nm = xtrue; then - c_plugins=${c_plugins}" nm" - libcharon_plugins=${libcharon_plugins}" nm" + charon_plugins=${charon_plugins}" medcli" fi if test x$dhcp = xtrue; then c_plugins=${c_plugins}" dhcp" - libcharon_plugins=${libcharon_plugins}" dhcp" + charon_plugins=${charon_plugins}" dhcp" fi if test x$android = xtrue; then c_plugins=${c_plugins}" android" - libcharon_plugins=${libcharon_plugins}" android" + charon_plugins=${charon_plugins}" android" + + fi + +if test x$android_log = xtrue; then + c_plugins=${c_plugins}" android-log" + charon_plugins=${charon_plugins}" android-log" fi if test x$ha = xtrue; then c_plugins=${c_plugins}" ha" - libcharon_plugins=${libcharon_plugins}" ha" + charon_plugins=${charon_plugins}" ha" fi if test x$whitelist = xtrue; then c_plugins=${c_plugins}" whitelist" - libcharon_plugins=${libcharon_plugins}" whitelist" + charon_plugins=${charon_plugins}" whitelist" fi if test x$certexpire = xtrue; then c_plugins=${c_plugins}" certexpire" - libcharon_plugins=${libcharon_plugins}" certexpire" + charon_plugins=${charon_plugins}" certexpire" fi if test x$led = xtrue; then c_plugins=${c_plugins}" led" - libcharon_plugins=${libcharon_plugins}" led" + charon_plugins=${charon_plugins}" led" fi if test x$duplicheck = xtrue; then c_plugins=${c_plugins}" duplicheck" - libcharon_plugins=${libcharon_plugins}" duplicheck" + charon_plugins=${charon_plugins}" duplicheck" fi if test x$coupling = xtrue; then c_plugins=${c_plugins}" coupling" - libcharon_plugins=${libcharon_plugins}" coupling" + charon_plugins=${charon_plugins}" coupling" fi if test x$radattr = xtrue; then c_plugins=${c_plugins}" radattr" - libcharon_plugins=${libcharon_plugins}" radattr" + charon_plugins=${charon_plugins}" radattr" fi if test x$maemo = xtrue; then c_plugins=${c_plugins}" maemo" - libcharon_plugins=${libcharon_plugins}" maemo" + charon_plugins=${charon_plugins}" maemo" fi if test x$uci = xtrue; then c_plugins=${c_plugins}" uci" - libcharon_plugins=${libcharon_plugins}" uci" + charon_plugins=${charon_plugins}" uci" fi if test x$addrblock = xtrue; then c_plugins=${c_plugins}" addrblock" - libcharon_plugins=${libcharon_plugins}" addrblock" + charon_plugins=${charon_plugins}" addrblock" + + fi + +if test x$unity = xtrue; then + c_plugins=${c_plugins}" unity" + charon_plugins=${charon_plugins}" unity" fi if test x$unit_tester = xtrue; then c_plugins=${c_plugins}" unit-tester" - libcharon_plugins=${libcharon_plugins}" unit-tester" + charon_plugins=${charon_plugins}" unit-tester" fi @@ -18292,6 +18668,14 @@ else USE_RANDOM_FALSE= fi + if test x$nonce = xtrue; then + USE_NONCE_TRUE= + USE_NONCE_FALSE='#' +else + USE_NONCE_TRUE='#' + USE_NONCE_FALSE= +fi + if test x$x509 = xtrue; then USE_X509_TRUE= USE_X509_FALSE='#' @@ -18501,14 +18885,6 @@ else USE_MEDCLI_FALSE= fi - if test x$nm = xtrue; then - USE_NM_TRUE= - USE_NM_FALSE='#' -else - USE_NM_TRUE='#' - USE_NM_FALSE= -fi - if test x$uci = xtrue; then USE_UCI_TRUE= USE_UCI_FALSE='#' @@ -18525,6 +18901,14 @@ else USE_ANDROID_FALSE= fi + if test x$android_log = xtrue; then + USE_ANDROID_LOG_TRUE= + USE_ANDROID_LOG_FALSE='#' +else + USE_ANDROID_LOG_TRUE='#' + USE_ANDROID_LOG_FALSE= +fi + if test x$maemo = xtrue; then USE_MAEMO_TRUE= USE_MAEMO_FALSE='#' @@ -18765,6 +19149,14 @@ else USE_EAP_TNC_FALSE= fi + if test x$eap_dynamic = xtrue; then + USE_EAP_DYNAMIC_TRUE= + USE_EAP_DYNAMIC_FALSE='#' +else + USE_EAP_DYNAMIC_TRUE='#' + USE_EAP_DYNAMIC_FALSE= +fi + if test x$eap_radius = xtrue; then USE_EAP_RADIUS_TRUE= USE_EAP_RADIUS_FALSE='#' @@ -18773,6 +19165,30 @@ else USE_EAP_RADIUS_FALSE= fi + if test x$xauth_generic = xtrue; then + USE_XAUTH_GENERIC_TRUE= + USE_XAUTH_GENERIC_FALSE='#' +else + USE_XAUTH_GENERIC_TRUE='#' + USE_XAUTH_GENERIC_FALSE= +fi + + if test x$xauth_eap = xtrue; then + USE_XAUTH_EAP_TRUE= + USE_XAUTH_EAP_FALSE='#' +else + USE_XAUTH_EAP_TRUE='#' + USE_XAUTH_EAP_FALSE= +fi + + if test x$xauth_pam = xtrue; then + USE_XAUTH_PAM_TRUE= + USE_XAUTH_PAM_FALSE='#' +else + USE_XAUTH_PAM_TRUE='#' + USE_XAUTH_PAM_FALSE= +fi + if test x$tnc_ifmap = xtrue; then USE_TNC_IFMAP_TRUE= USE_TNC_IFMAP_FALSE='#' @@ -18893,14 +19309,6 @@ else USE_SOCKET_DEFAULT_FALSE= fi - if test x$socket_raw = xtrue; then - USE_SOCKET_RAW_TRUE= - USE_SOCKET_RAW_FALSE='#' -else - USE_SOCKET_RAW_TRUE='#' - USE_SOCKET_RAW_FALSE= -fi - if test x$socket_dynamic = xtrue; then USE_SOCKET_DYNAMIC_TRUE= USE_SOCKET_DYNAMIC_FALSE='#' @@ -18925,6 +19333,14 @@ else USE_ADDRBLOCK_FALSE= fi + if test x$unity = xtrue; then + USE_UNITY_TRUE= + USE_UNITY_FALSE='#' +else + USE_UNITY_TRUE='#' + USE_UNITY_FALSE= +fi + if test x$attr = xtrue; then USE_ATTR_TRUE= @@ -18983,31 +19399,6 @@ else fi - if test x$xauth = xtrue; then - USE_XAUTH_TRUE= - USE_XAUTH_FALSE='#' -else - USE_XAUTH_TRUE='#' - USE_XAUTH_FALSE= -fi - - - if test x$smartcard = xtrue; then - USE_SMARTCARD_TRUE= - USE_SMARTCARD_FALSE='#' -else - USE_SMARTCARD_TRUE='#' - USE_SMARTCARD_FALSE= -fi - - if test x$cisco_quirks = xtrue; then - USE_CISCO_QUIRKS_TRUE= - USE_CISCO_QUIRKS_FALSE='#' -else - USE_CISCO_QUIRKS_TRUE='#' - USE_CISCO_QUIRKS_FALSE= -fi - if test x$leak_detective = xtrue; then USE_LEAK_DETECTIVE_TRUE= USE_LEAK_DETECTIVE_FALSE='#' @@ -19024,30 +19415,6 @@ else USE_LOCK_PROFILER_FALSE= fi - if test x$nat_transport = xtrue; then - USE_NAT_TRANSPORT_TRUE= - USE_NAT_TRANSPORT_FALSE='#' -else - USE_NAT_TRANSPORT_TRUE='#' - USE_NAT_TRANSPORT_FALSE= -fi - - if test x$vendor_id = xtrue; then - USE_VENDORID_TRUE= - USE_VENDORID_FALSE='#' -else - USE_VENDORID_TRUE='#' - USE_VENDORID_FALSE= -fi - - if test x$xauth_vid = xtrue; then - USE_XAUTH_VID_TRUE= - USE_XAUTH_VID_FALSE='#' -else - USE_XAUTH_VID_TRUE='#' - USE_XAUTH_VID_FALSE= -fi - if test x$dumm = xtrue; then USE_DUMM_TRUE= USE_DUMM_FALSE='#' @@ -19096,12 +19463,20 @@ else USE_LOAD_WARNING_FALSE= fi - if test x$pluto = xtrue; then - USE_PLUTO_TRUE= - USE_PLUTO_FALSE='#' + if test x$ikev1 = xtrue; then + USE_IKEV1_TRUE= + USE_IKEV1_FALSE='#' else - USE_PLUTO_TRUE='#' - USE_PLUTO_FALSE= + USE_IKEV1_TRUE='#' + USE_IKEV1_FALSE= +fi + + if test x$ikev2 = xtrue; then + USE_IKEV2_TRUE= + USE_IKEV2_FALSE='#' +else + USE_IKEV2_TRUE='#' + USE_IKEV2_FALSE= fi if test x$threads = xtrue; then @@ -19128,6 +19503,14 @@ else USE_CHARON_FALSE= fi + if test x$nm = xtrue; then + USE_NM_TRUE= + USE_NM_FALSE='#' +else + USE_NM_TRUE='#' + USE_NM_FALSE= +fi + if test x$tools = xtrue; then USE_TOOLS_TRUE= USE_TOOLS_FALSE='#' @@ -19152,7 +19535,7 @@ else USE_CONFTEST_FALSE= fi - if test x$charon = xtrue -o x$pluto = xtrue -o x$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue; then + if test x$charon = xtrue -o x$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue -o x$nm = xtrue; then USE_LIBSTRONGSWAN_TRUE= USE_LIBSTRONGSWAN_FALSE='#' else @@ -19160,7 +19543,7 @@ else USE_LIBSTRONGSWAN_FALSE= fi - if test x$charon = xtrue -o x$pluto = xtrue; then + if test x$charon = xtrue -o x$nm = xtrue; then USE_LIBHYDRA_TRUE= USE_LIBHYDRA_FALSE='#' else @@ -19168,7 +19551,7 @@ else USE_LIBHYDRA_FALSE= fi - if test x$charon = xtrue -o x$conftest = xtrue; then + if test x$charon = xtrue -o x$conftest = xtrue -o x$nm = xtrue; then USE_LIBCHARON_TRUE= USE_LIBCHARON_FALSE='#' else @@ -19176,6 +19559,14 @@ else USE_LIBCHARON_FALSE= fi + if test x$libipsec = xtrue; then + USE_LIBIPSEC_TRUE= + USE_LIBIPSEC_FALSE='#' +else + USE_LIBIPSEC_TRUE='#' + USE_LIBIPSEC_FALSE= +fi + if test x$tnc_tnccs = xtrue -o x$imcv = xtrue; then USE_LIBTNCIF_TRUE= USE_LIBTNCIF_FALSE='#' @@ -19192,7 +19583,7 @@ else USE_LIBTNCCS_FALSE= fi - if test x$pluto = xtrue -o x$stroke = xtrue; then + if test x$stroke = xtrue; then USE_FILE_CONFIG_TRUE= USE_FILE_CONFIG_FALSE='#' else @@ -19200,7 +19591,7 @@ else USE_FILE_CONFIG_FALSE= fi - if test x$pluto = xtrue -o x$stroke = xtrue -o x$tools = xtrue -o x$conftest = xtrue; then + if test x$stroke = xtrue -o x$tools = xtrue -o x$conftest = xtrue; then USE_IPSEC_SCRIPT_TRUE= USE_IPSEC_SCRIPT_FALSE='#' else @@ -19275,21 +19666,33 @@ fi if test x$mediation = xtrue; then - $as_echo "#define ME 1" >>confdefs.h + +$as_echo "#define ME /**/" >>confdefs.h fi if test x$capabilities = xlibcap -o x$capabilities = xnative; then - $as_echo "#define CAPABILITIES 1" >>confdefs.h + +$as_echo "#define CAPABILITIES /**/" >>confdefs.h fi if test x$monolithic = xtrue; then - $as_echo "#define MONOLITHIC 1" >>confdefs.h + +$as_echo "#define MONOLITHIC /**/" >>confdefs.h fi +if test x$ikev1 = xtrue; then +$as_echo "#define USE_IKEV1 /**/" >>confdefs.h +fi +if test x$ikev2 = xtrue; then -ac_config_files="$ac_config_files 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/md4/Makefile src/libstrongswan/plugins/md5/Makefile src/libstrongswan/plugins/sha1/Makefile src/libstrongswan/plugins/sha2/Makefile src/libstrongswan/plugins/fips_prf/Makefile src/libstrongswan/plugins/gmp/Makefile src/libstrongswan/plugins/random/Makefile src/libstrongswan/plugins/hmac/Makefile src/libstrongswan/plugins/xcbc/Makefile src/libstrongswan/plugins/x509/Makefile src/libstrongswan/plugins/revocation/Makefile src/libstrongswan/plugins/constraints/Makefile src/libstrongswan/plugins/pubkey/Makefile src/libstrongswan/plugins/pkcs1/Makefile src/libstrongswan/plugins/pkcs8/Makefile src/libstrongswan/plugins/pgp/Makefile src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/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/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/test_vectors/Makefile src/libhydra/Makefile src/libhydra/plugins/attr/Makefile src/libhydra/plugins/attr_sql/Makefile src/libhydra/plugins/kernel_klips/Makefile src/libhydra/plugins/kernel_netlink/Makefile src/libhydra/plugins/kernel_pfkey/Makefile src/libhydra/plugins/kernel_pfroute/Makefile src/libhydra/plugins/resolve/Makefile src/libfreeswan/Makefile src/libsimaka/Makefile src/libtls/Makefile src/libradius/Makefile src/libtncif/Makefile src/libtnccs/Makefile src/libpts/Makefile src/libpts/plugins/imc_attestation/Makefile src/libpts/plugins/imv_attestation/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/pluto/Makefile src/pluto/plugins/xauth/Makefile src/whack/Makefile src/charon/Makefile src/libcharon/Makefile src/libcharon/plugins/eap_aka/Makefile src/libcharon/plugins/eap_aka_3gpp2/Makefile src/libcharon/plugins/eap_identity/Makefile src/libcharon/plugins/eap_md5/Makefile src/libcharon/plugins/eap_gtc/Makefile src/libcharon/plugins/eap_sim/Makefile src/libcharon/plugins/eap_sim_file/Makefile src/libcharon/plugins/eap_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/tnc_ifmap/Makefile src/libcharon/plugins/tnc_pdp/Makefile src/libcharon/plugins/tnc_imc/Makefile src/libcharon/plugins/tnc_imv/Makefile src/libcharon/plugins/tnc_tnccs/Makefile src/libcharon/plugins/tnccs_11/Makefile src/libcharon/plugins/tnccs_20/Makefile src/libcharon/plugins/tnccs_dynamic/Makefile src/libcharon/plugins/socket_default/Makefile src/libcharon/plugins/socket_raw/Makefile src/libcharon/plugins/socket_dynamic/Makefile src/libcharon/plugins/farp/Makefile src/libcharon/plugins/smp/Makefile src/libcharon/plugins/sql/Makefile src/libcharon/plugins/medsrv/Makefile src/libcharon/plugins/medcli/Makefile src/libcharon/plugins/nm/Makefile src/libcharon/plugins/addrblock/Makefile src/libcharon/plugins/uci/Makefile src/libcharon/plugins/ha/Makefile src/libcharon/plugins/whitelist/Makefile src/libcharon/plugins/certexpire/Makefile src/libcharon/plugins/led/Makefile src/libcharon/plugins/duplicheck/Makefile src/libcharon/plugins/coupling/Makefile src/libcharon/plugins/radattr/Makefile src/libcharon/plugins/android/Makefile src/libcharon/plugins/maemo/Makefile src/libcharon/plugins/stroke/Makefile src/libcharon/plugins/updown/Makefile src/libcharon/plugins/dhcp/Makefile src/libcharon/plugins/unit_tester/Makefile src/libcharon/plugins/load_tester/Makefile src/stroke/Makefile src/ipsec/Makefile src/starter/Makefile src/_updown/Makefile src/_updown_espmark/Makefile src/_copyright/Makefile src/openac/Makefile src/scepclient/Makefile src/pki/Makefile src/dumm/Makefile src/dumm/ext/extconf.rb src/libfast/Makefile src/manager/Makefile src/medsrv/Makefile src/checksum/Makefile src/conftest/Makefile scripts/Makefile testing/Makefile" +$as_echo "#define USE_IKEV2 /**/" >>confdefs.h + +fi + + +ac_config_files="$ac_config_files 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/md4/Makefile src/libstrongswan/plugins/md5/Makefile src/libstrongswan/plugins/sha1/Makefile src/libstrongswan/plugins/sha2/Makefile src/libstrongswan/plugins/fips_prf/Makefile src/libstrongswan/plugins/gmp/Makefile src/libstrongswan/plugins/random/Makefile src/libstrongswan/plugins/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/pkcs8/Makefile src/libstrongswan/plugins/pgp/Makefile src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/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/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/test_vectors/Makefile src/libhydra/Makefile src/libhydra/plugins/attr/Makefile src/libhydra/plugins/attr_sql/Makefile src/libhydra/plugins/kernel_klips/Makefile src/libhydra/plugins/kernel_netlink/Makefile src/libhydra/plugins/kernel_pfkey/Makefile src/libhydra/plugins/kernel_pfroute/Makefile src/libhydra/plugins/resolve/Makefile src/libipsec/Makefile src/libsimaka/Makefile src/libtls/Makefile src/libradius/Makefile src/libtncif/Makefile src/libtnccs/Makefile src/libpts/Makefile src/libpts/plugins/imc_attestation/Makefile src/libpts/plugins/imv_attestation/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/charon/Makefile src/charon-nm/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/tnc_ifmap/Makefile src/libcharon/plugins/tnc_pdp/Makefile src/libcharon/plugins/tnc_imc/Makefile src/libcharon/plugins/tnc_imv/Makefile src/libcharon/plugins/tnc_tnccs/Makefile src/libcharon/plugins/tnccs_11/Makefile src/libcharon/plugins/tnccs_20/Makefile src/libcharon/plugins/tnccs_dynamic/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/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/whitelist/Makefile src/libcharon/plugins/certexpire/Makefile src/libcharon/plugins/led/Makefile src/libcharon/plugins/duplicheck/Makefile src/libcharon/plugins/coupling/Makefile src/libcharon/plugins/radattr/Makefile src/libcharon/plugins/android/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/dumm/Makefile src/dumm/ext/extconf.rb src/libfast/Makefile src/manager/Makefile src/medsrv/Makefile src/checksum/Makefile src/conftest/Makefile scripts/Makefile testing/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -19370,43 +19773,7 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -ac_script=' -:mline -/\\$/{ - N - s,\\\n,, - b mline -} -t clear -:clear -s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -t quote -s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -t quote -b any -:quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g -s/\$/$$/g -H -:any -${ - g - s/^\n// - s/\n/ /g - p -} -' -DEFS=`sed -n "$ac_script" confdefs.h` - +DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= @@ -19446,6 +19813,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_DEV_HEADERS_TRUE}" && test -z "${USE_DEV_HEADERS_FALSE}"; then + as_fn_error $? "conditional \"USE_DEV_HEADERS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_TEST_VECTORS_TRUE}" && test -z "${USE_TEST_VECTORS_FALSE}"; then as_fn_error $? "conditional \"USE_TEST_VECTORS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19502,6 +19873,10 @@ if test -z "${USE_RANDOM_TRUE}" && test -z "${USE_RANDOM_FALSE}"; then as_fn_error $? "conditional \"USE_RANDOM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_NONCE_TRUE}" && test -z "${USE_NONCE_FALSE}"; then + as_fn_error $? "conditional \"USE_NONCE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_X509_TRUE}" && test -z "${USE_X509_FALSE}"; then as_fn_error $? "conditional \"USE_X509\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19606,10 +19981,6 @@ if test -z "${USE_MEDCLI_TRUE}" && test -z "${USE_MEDCLI_FALSE}"; then as_fn_error $? "conditional \"USE_MEDCLI\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${USE_NM_TRUE}" && test -z "${USE_NM_FALSE}"; then - as_fn_error $? "conditional \"USE_NM\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${USE_UCI_TRUE}" && test -z "${USE_UCI_FALSE}"; then as_fn_error $? "conditional \"USE_UCI\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19618,6 +19989,10 @@ if test -z "${USE_ANDROID_TRUE}" && test -z "${USE_ANDROID_FALSE}"; then as_fn_error $? "conditional \"USE_ANDROID\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_ANDROID_LOG_TRUE}" && test -z "${USE_ANDROID_LOG_FALSE}"; then + as_fn_error $? "conditional \"USE_ANDROID_LOG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_MAEMO_TRUE}" && test -z "${USE_MAEMO_FALSE}"; then as_fn_error $? "conditional \"USE_MAEMO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19738,10 +20113,26 @@ if test -z "${USE_EAP_TNC_TRUE}" && test -z "${USE_EAP_TNC_FALSE}"; then as_fn_error $? "conditional \"USE_EAP_TNC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_EAP_DYNAMIC_TRUE}" && test -z "${USE_EAP_DYNAMIC_FALSE}"; then + as_fn_error $? "conditional \"USE_EAP_DYNAMIC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_EAP_RADIUS_TRUE}" && test -z "${USE_EAP_RADIUS_FALSE}"; then as_fn_error $? "conditional \"USE_EAP_RADIUS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_XAUTH_GENERIC_TRUE}" && test -z "${USE_XAUTH_GENERIC_FALSE}"; then + as_fn_error $? "conditional \"USE_XAUTH_GENERIC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${USE_XAUTH_EAP_TRUE}" && test -z "${USE_XAUTH_EAP_FALSE}"; then + as_fn_error $? "conditional \"USE_XAUTH_EAP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${USE_XAUTH_PAM_TRUE}" && test -z "${USE_XAUTH_PAM_FALSE}"; then + as_fn_error $? "conditional \"USE_XAUTH_PAM\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_TNC_IFMAP_TRUE}" && test -z "${USE_TNC_IFMAP_FALSE}"; then as_fn_error $? "conditional \"USE_TNC_IFMAP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19802,10 +20193,6 @@ if test -z "${USE_SOCKET_DEFAULT_TRUE}" && test -z "${USE_SOCKET_DEFAULT_FALSE}" as_fn_error $? "conditional \"USE_SOCKET_DEFAULT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${USE_SOCKET_RAW_TRUE}" && test -z "${USE_SOCKET_RAW_FALSE}"; then - as_fn_error $? "conditional \"USE_SOCKET_RAW\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${USE_SOCKET_DYNAMIC_TRUE}" && test -z "${USE_SOCKET_DYNAMIC_FALSE}"; then as_fn_error $? "conditional \"USE_SOCKET_DYNAMIC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19818,6 +20205,10 @@ if test -z "${USE_ADDRBLOCK_TRUE}" && test -z "${USE_ADDRBLOCK_FALSE}"; then as_fn_error $? "conditional \"USE_ADDRBLOCK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_UNITY_TRUE}" && test -z "${USE_UNITY_FALSE}"; then + as_fn_error $? "conditional \"USE_UNITY\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_ATTR_TRUE}" && test -z "${USE_ATTR_FALSE}"; then as_fn_error $? "conditional \"USE_ATTR\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19846,18 +20237,6 @@ if test -z "${USE_RESOLVE_TRUE}" && test -z "${USE_RESOLVE_FALSE}"; then as_fn_error $? "conditional \"USE_RESOLVE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${USE_XAUTH_TRUE}" && test -z "${USE_XAUTH_FALSE}"; then - as_fn_error $? "conditional \"USE_XAUTH\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${USE_SMARTCARD_TRUE}" && test -z "${USE_SMARTCARD_FALSE}"; then - as_fn_error $? "conditional \"USE_SMARTCARD\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${USE_CISCO_QUIRKS_TRUE}" && test -z "${USE_CISCO_QUIRKS_FALSE}"; then - as_fn_error $? "conditional \"USE_CISCO_QUIRKS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${USE_LEAK_DETECTIVE_TRUE}" && test -z "${USE_LEAK_DETECTIVE_FALSE}"; then as_fn_error $? "conditional \"USE_LEAK_DETECTIVE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19866,18 +20245,6 @@ if test -z "${USE_LOCK_PROFILER_TRUE}" && test -z "${USE_LOCK_PROFILER_FALSE}"; as_fn_error $? "conditional \"USE_LOCK_PROFILER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${USE_NAT_TRANSPORT_TRUE}" && test -z "${USE_NAT_TRANSPORT_FALSE}"; then - as_fn_error $? "conditional \"USE_NAT_TRANSPORT\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${USE_VENDORID_TRUE}" && test -z "${USE_VENDORID_FALSE}"; then - as_fn_error $? "conditional \"USE_VENDORID\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${USE_XAUTH_VID_TRUE}" && test -z "${USE_XAUTH_VID_FALSE}"; then - as_fn_error $? "conditional \"USE_XAUTH_VID\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${USE_DUMM_TRUE}" && test -z "${USE_DUMM_FALSE}"; then as_fn_error $? "conditional \"USE_DUMM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19902,8 +20269,12 @@ if test -z "${USE_LOAD_WARNING_TRUE}" && test -z "${USE_LOAD_WARNING_FALSE}"; th as_fn_error $? "conditional \"USE_LOAD_WARNING\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${USE_PLUTO_TRUE}" && test -z "${USE_PLUTO_FALSE}"; then - as_fn_error $? "conditional \"USE_PLUTO\" was never defined. +if test -z "${USE_IKEV1_TRUE}" && test -z "${USE_IKEV1_FALSE}"; then + as_fn_error $? "conditional \"USE_IKEV1\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${USE_IKEV2_TRUE}" && test -z "${USE_IKEV2_FALSE}"; then + as_fn_error $? "conditional \"USE_IKEV2\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_THREADS_TRUE}" && test -z "${USE_THREADS_FALSE}"; then @@ -19918,6 +20289,10 @@ if test -z "${USE_CHARON_TRUE}" && test -z "${USE_CHARON_FALSE}"; then as_fn_error $? "conditional \"USE_CHARON\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_NM_TRUE}" && test -z "${USE_NM_FALSE}"; then + as_fn_error $? "conditional \"USE_NM\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_TOOLS_TRUE}" && test -z "${USE_TOOLS_FALSE}"; then as_fn_error $? "conditional \"USE_TOOLS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19942,6 +20317,10 @@ if test -z "${USE_LIBCHARON_TRUE}" && test -z "${USE_LIBCHARON_FALSE}"; then as_fn_error $? "conditional \"USE_LIBCHARON\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_LIBIPSEC_TRUE}" && test -z "${USE_LIBIPSEC_FALSE}"; then + as_fn_error $? "conditional \"USE_LIBIPSEC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_LIBTNCIF_TRUE}" && test -z "${USE_LIBTNCIF_FALSE}"; then as_fn_error $? "conditional \"USE_LIBTNCIF\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20398,7 +20777,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by strongSwan $as_me 4.6.4, which was +This file was extended by strongSwan $as_me 5.0.1, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20416,11 +20795,15 @@ case $ac_config_files in *" "*) set x $ac_config_files; shift; ac_config_files=$*;; esac +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" +config_headers="$ac_config_headers" config_commands="$ac_config_commands" _ACEOF @@ -20442,10 +20825,15 @@ Usage: $0 [OPTION]... [TAG]... --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files +Configuration headers: +$config_headers + Configuration commands: $config_commands @@ -20455,7 +20843,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 4.6.4 +strongSwan config.status 5.0.1 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" @@ -20512,7 +20900,18 @@ do esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) @@ -20828,6 +21227,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 for ac_config_target in $ac_config_targets do case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; @@ -20848,6 +21248,7 @@ do "src/libstrongswan/plugins/fips_prf/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/fips_prf/Makefile" ;; "src/libstrongswan/plugins/gmp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/gmp/Makefile" ;; "src/libstrongswan/plugins/random/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/random/Makefile" ;; + "src/libstrongswan/plugins/nonce/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/nonce/Makefile" ;; "src/libstrongswan/plugins/hmac/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/hmac/Makefile" ;; "src/libstrongswan/plugins/xcbc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/xcbc/Makefile" ;; "src/libstrongswan/plugins/x509/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/x509/Makefile" ;; @@ -20882,7 +21283,7 @@ do "src/libhydra/plugins/kernel_pfkey/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/plugins/kernel_pfkey/Makefile" ;; "src/libhydra/plugins/kernel_pfroute/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/plugins/kernel_pfroute/Makefile" ;; "src/libhydra/plugins/resolve/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/plugins/resolve/Makefile" ;; - "src/libfreeswan/Makefile") CONFIG_FILES="$CONFIG_FILES src/libfreeswan/Makefile" ;; + "src/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/libradius/Makefile") CONFIG_FILES="$CONFIG_FILES src/libradius/Makefile" ;; @@ -20896,13 +21297,12 @@ do "src/libimcv/plugins/imv_test/Makefile") CONFIG_FILES="$CONFIG_FILES src/libimcv/plugins/imv_test/Makefile" ;; "src/libimcv/plugins/imc_scanner/Makefile") CONFIG_FILES="$CONFIG_FILES src/libimcv/plugins/imc_scanner/Makefile" ;; "src/libimcv/plugins/imv_scanner/Makefile") CONFIG_FILES="$CONFIG_FILES src/libimcv/plugins/imv_scanner/Makefile" ;; - "src/pluto/Makefile") CONFIG_FILES="$CONFIG_FILES src/pluto/Makefile" ;; - "src/pluto/plugins/xauth/Makefile") CONFIG_FILES="$CONFIG_FILES src/pluto/plugins/xauth/Makefile" ;; - "src/whack/Makefile") CONFIG_FILES="$CONFIG_FILES src/whack/Makefile" ;; "src/charon/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/Makefile" ;; + "src/charon-nm/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon-nm/Makefile" ;; "src/libcharon/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/Makefile" ;; "src/libcharon/plugins/eap_aka/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_aka/Makefile" ;; "src/libcharon/plugins/eap_aka_3gpp2/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_aka_3gpp2/Makefile" ;; + "src/libcharon/plugins/eap_dynamic/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_dynamic/Makefile" ;; "src/libcharon/plugins/eap_identity/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_identity/Makefile" ;; "src/libcharon/plugins/eap_md5/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_md5/Makefile" ;; "src/libcharon/plugins/eap_gtc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_gtc/Makefile" ;; @@ -20918,6 +21318,9 @@ do "src/libcharon/plugins/eap_peap/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_peap/Makefile" ;; "src/libcharon/plugins/eap_tnc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_tnc/Makefile" ;; "src/libcharon/plugins/eap_radius/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_radius/Makefile" ;; + "src/libcharon/plugins/xauth_generic/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/xauth_generic/Makefile" ;; + "src/libcharon/plugins/xauth_eap/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/xauth_eap/Makefile" ;; + "src/libcharon/plugins/xauth_pam/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/xauth_pam/Makefile" ;; "src/libcharon/plugins/tnc_ifmap/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnc_ifmap/Makefile" ;; "src/libcharon/plugins/tnc_pdp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnc_pdp/Makefile" ;; "src/libcharon/plugins/tnc_imc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnc_imc/Makefile" ;; @@ -20927,15 +21330,14 @@ do "src/libcharon/plugins/tnccs_20/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnccs_20/Makefile" ;; "src/libcharon/plugins/tnccs_dynamic/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnccs_dynamic/Makefile" ;; "src/libcharon/plugins/socket_default/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/socket_default/Makefile" ;; - "src/libcharon/plugins/socket_raw/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/socket_raw/Makefile" ;; "src/libcharon/plugins/socket_dynamic/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/socket_dynamic/Makefile" ;; "src/libcharon/plugins/farp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/farp/Makefile" ;; "src/libcharon/plugins/smp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/smp/Makefile" ;; "src/libcharon/plugins/sql/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/sql/Makefile" ;; "src/libcharon/plugins/medsrv/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/medsrv/Makefile" ;; "src/libcharon/plugins/medcli/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/medcli/Makefile" ;; - "src/libcharon/plugins/nm/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/nm/Makefile" ;; "src/libcharon/plugins/addrblock/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/addrblock/Makefile" ;; + "src/libcharon/plugins/unity/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/unity/Makefile" ;; "src/libcharon/plugins/uci/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/uci/Makefile" ;; "src/libcharon/plugins/ha/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/ha/Makefile" ;; "src/libcharon/plugins/whitelist/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/whitelist/Makefile" ;; @@ -20945,6 +21347,7 @@ do "src/libcharon/plugins/coupling/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/coupling/Makefile" ;; "src/libcharon/plugins/radattr/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/radattr/Makefile" ;; "src/libcharon/plugins/android/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/android/Makefile" ;; + "src/libcharon/plugins/android_log/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/android_log/Makefile" ;; "src/libcharon/plugins/maemo/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/maemo/Makefile" ;; "src/libcharon/plugins/stroke/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/stroke/Makefile" ;; "src/libcharon/plugins/updown/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/updown/Makefile" ;; @@ -20981,6 +21384,7 @@ done # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi @@ -21167,8 +21571,116 @@ fi cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' <confdefs.h | sed ' +s/'"$ac_delim"'/"\\\ +"/g' >>$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + -eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS" +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" shift for ac_tag do @@ -21386,7 +21898,64 @@ which seems to be undefined. Please make sure it is defined" >&2;} esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} |