diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 711 |
1 files changed, 362 insertions, 349 deletions
@@ -1,10 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -<<<<<<< HEAD -# Generated by GNU Autoconf 2.67 for strongSwan 4.5.0. -======= -# Generated by GNU Autoconf 2.67 for strongSwan 4.5.1. ->>>>>>> upstream/4.5.1 +# Generated by GNU Autoconf 2.67 for strongSwan 4.5.2. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -702,13 +698,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='strongSwan' PACKAGE_TARNAME='strongswan' -<<<<<<< HEAD -PACKAGE_VERSION='4.5.0' -PACKAGE_STRING='strongSwan 4.5.0' -======= -PACKAGE_VERSION='4.5.1' -PACKAGE_STRING='strongSwan 4.5.1' ->>>>>>> upstream/4.5.1 +PACKAGE_VERSION='4.5.2' +PACKAGE_STRING='strongSwan 4.5.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -762,26 +753,18 @@ USE_VSTR_FALSE USE_VSTR_TRUE USE_LIBCAP_FALSE USE_LIBCAP_TRUE -<<<<<<< HEAD -USE_FILE_CONFIG_FALSE -USE_FILE_CONFIG_TRUE -======= USE_IPSEC_SCRIPT_FALSE USE_IPSEC_SCRIPT_TRUE USE_FILE_CONFIG_FALSE USE_FILE_CONFIG_TRUE USE_LIBCHARON_FALSE USE_LIBCHARON_TRUE ->>>>>>> upstream/4.5.1 USE_LIBHYDRA_FALSE USE_LIBHYDRA_TRUE USE_LIBSTRONGSWAN_FALSE USE_LIBSTRONGSWAN_TRUE -<<<<<<< HEAD -======= USE_CONFTEST_FALSE USE_CONFTEST_TRUE ->>>>>>> upstream/4.5.1 USE_SCRIPTS_FALSE USE_SCRIPTS_TRUE USE_TOOLS_FALSE @@ -844,11 +827,8 @@ USE_SOCKET_RAW_FALSE USE_SOCKET_RAW_TRUE USE_SOCKET_DEFAULT_FALSE USE_SOCKET_DEFAULT_TRUE -<<<<<<< HEAD -======= USE_TNCCS_DYNAMIC_FALSE USE_TNCCS_DYNAMIC_TRUE ->>>>>>> upstream/4.5.1 USE_TNCCS_20_FALSE USE_TNCCS_20_TRUE USE_TNCCS_11_FALSE @@ -861,6 +841,8 @@ USE_EAP_RADIUS_FALSE USE_EAP_RADIUS_TRUE USE_EAP_TNC_FALSE USE_EAP_TNC_TRUE +USE_EAP_PEAP_FALSE +USE_EAP_PEAP_TRUE USE_EAP_TTLS_FALSE USE_EAP_TTLS_TRUE USE_EAP_TLS_FALSE @@ -883,12 +865,20 @@ USE_EAP_SIMAKA_PSEUDONYM_FALSE USE_EAP_SIMAKA_PSEUDONYM_TRUE USE_EAP_SIMAKA_SQL_FALSE USE_EAP_SIMAKA_SQL_TRUE +USE_EAP_SIM_PCSC_FALSE +USE_EAP_SIM_PCSC_TRUE USE_EAP_SIM_FILE_FALSE USE_EAP_SIM_FILE_TRUE USE_EAP_SIM_FALSE USE_EAP_SIM_TRUE +USE_COUPLING_FALSE +USE_COUPLING_TRUE +USE_DUPLICHECK_FALSE +USE_DUPLICHECK_TRUE USE_LED_FALSE USE_LED_TRUE +USE_WHITELIST_FALSE +USE_WHITELIST_TRUE USE_HA_FALSE USE_HA_TRUE USE_LOAD_TESTER_FALSE @@ -917,11 +907,8 @@ USE_MEDSRV_FALSE USE_MEDSRV_TRUE USE_STROKE_FALSE USE_STROKE_TRUE -<<<<<<< HEAD -======= USE_AF_ALG_FALSE USE_AF_ALG_TRUE ->>>>>>> upstream/4.5.1 USE_GCM_FALSE USE_GCM_TRUE USE_CCM_FALSE @@ -956,11 +943,8 @@ USE_PKCS1_FALSE USE_PKCS1_TRUE USE_PUBKEY_FALSE USE_PUBKEY_TRUE -<<<<<<< HEAD -======= USE_CONSTRAINTS_FALSE USE_CONSTRAINTS_TRUE ->>>>>>> upstream/4.5.1 USE_REVOCATION_FALSE USE_REVOCATION_TRUE USE_X509_FALSE @@ -987,11 +971,8 @@ USE_AES_FALSE USE_AES_TRUE USE_LDAP_FALSE USE_LDAP_TRUE -<<<<<<< HEAD -======= USE_SOUP_FALSE USE_SOUP_TRUE ->>>>>>> upstream/4.5.1 USE_CURL_FALSE USE_CURL_TRUE USE_TEST_VECTORS_FALSE @@ -1011,6 +992,8 @@ pluto_plugins libcharon_plugins nm_LIBS nm_CFLAGS +pcsclite_LIBS +pcsclite_CFLAGS dbusservicedir maemo_LIBS maemo_CFLAGS @@ -1023,22 +1006,14 @@ gtk_LIBS gtk_CFLAGS xml_LIBS xml_CFLAGS -<<<<<<< HEAD -======= soup_LIBS soup_CFLAGS ->>>>>>> upstream/4.5.1 PTHREADLIB RTLIB SOCKLIB BTLIB DLLIB ALLOCA -<<<<<<< HEAD -ipsecgid -ipsecuid -======= ->>>>>>> upstream/4.5.1 GPERF PERL YFLAGS @@ -1092,6 +1067,9 @@ CFLAGS CC ipsecgroup ipsecuser +systemdsystemunitdir +HAVE_SYSTEMD_FALSE +HAVE_SYSTEMD_TRUE routing_table_prio routing_table linux_headers @@ -1185,14 +1163,12 @@ with_routing_table with_routing_table_prio with_capabilities with_mpz_powm_sec +with_systemdsystemunitdir with_xauth_module with_user with_group enable_curl -<<<<<<< HEAD -======= enable_soup ->>>>>>> upstream/4.5.1 enable_ldap enable_aes enable_des @@ -1206,10 +1182,7 @@ enable_gmp enable_random enable_x509 enable_revocation -<<<<<<< HEAD -======= enable_constraints ->>>>>>> upstream/4.5.1 enable_pubkey enable_pkcs1 enable_pgp @@ -1217,10 +1190,7 @@ enable_dnskey enable_pem enable_hmac enable_xcbc -<<<<<<< HEAD -======= enable_af_alg ->>>>>>> upstream/4.5.1 enable_test_vectors enable_mysql enable_sqlite @@ -1237,6 +1207,7 @@ enable_unit_tests enable_load_tester enable_eap_sim enable_eap_sim_file +enable_eap_sim_pcsc enable_eap_simaka_sql enable_eap_simaka_pseudonym enable_eap_simaka_reauth @@ -1248,16 +1219,14 @@ enable_eap_aka_3gpp2 enable_eap_mschapv2 enable_eap_tls enable_eap_ttls +enable_eap_peap enable_eap_tnc enable_eap_radius enable_tnc_imc enable_tnc_imv enable_tnccs_11 enable_tnccs_20 -<<<<<<< HEAD -======= enable_tnccs_dynamic ->>>>>>> upstream/4.5.1 enable_kernel_netlink enable_kernel_pfkey enable_kernel_pfroute @@ -1281,10 +1250,7 @@ enable_threads enable_charon enable_tools enable_scripts -<<<<<<< HEAD -======= enable_conftest ->>>>>>> upstream/4.5.1 enable_updown enable_attr enable_attr_sql @@ -1304,7 +1270,10 @@ enable_android enable_maemo enable_nm enable_ha +enable_whitelist enable_led +enable_duplicheck +enable_coupling enable_vstr enable_monolithic enable_dependency_tracking @@ -1330,17 +1299,16 @@ CPPFLAGS CPP YACC YFLAGS -<<<<<<< HEAD -======= soup_CFLAGS soup_LIBS ->>>>>>> upstream/4.5.1 xml_CFLAGS xml_LIBS gtk_CFLAGS gtk_LIBS maemo_CFLAGS maemo_LIBS +pcsclite_CFLAGS +pcsclite_LIBS nm_CFLAGS nm_LIBS' @@ -1885,11 +1853,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 -<<<<<<< HEAD -\`configure' configures strongSwan 4.5.0 to adapt to many kinds of systems. -======= -\`configure' configures strongSwan 4.5.1 to adapt to many kinds of systems. ->>>>>>> upstream/4.5.1 +\`configure' configures strongSwan 4.5.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1959,11 +1923,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in -<<<<<<< HEAD - short | recursive ) echo "Configuration of strongSwan 4.5.0:";; -======= - short | recursive ) echo "Configuration of strongSwan 4.5.1:";; ->>>>>>> upstream/4.5.1 + short | recursive ) echo "Configuration of strongSwan 4.5.2:";; esac cat <<\_ACEOF @@ -1973,11 +1933,8 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-curl enable CURL fetcher plugin to fetch files via libcurl. Requires libcurl. -<<<<<<< HEAD -======= --enable-soup enable soup fetcher plugin to fetch from HTTP via libsoup. Requires libsoup. ->>>>>>> upstream/4.5.1 --enable-ldap enable LDAP fetching plugin to fetch files via libldap. Requires openLDAP. --disable-aes disable AES software implementation plugin. @@ -1994,10 +1951,7 @@ Optional Features: --disable-random disable RNG implementation on top of /dev/(u)random. --disable-x509 disable X509 certificate implementation plugin. --disable-revocation disable X509 CRL/OCSP revocation check plugin. -<<<<<<< HEAD -======= --disable-constraints disable advanced X509 constraint checking plugin. ->>>>>>> upstream/4.5.1 --disable-pubkey disable RAW public key support plugin. --disable-pkcs1 disable PKCS1 key decoding plugin. --disable-pgp disable PGP key decoding plugin. @@ -2005,10 +1959,7 @@ Optional Features: --disable-pem disable PEM decoding plugin. --disable-hmac disable HMAC crypto implementation plugin. --disable-xcbc disable xcbc crypto implementation plugin. -<<<<<<< HEAD -======= --enable-af-alg enable AF_ALG crypto interface to Linux Crypto API. ->>>>>>> upstream/4.5.1 --enable-test-vectors enable plugin providing crypto test vectors. --enable-mysql enable MySQL database support. Requires libmysqlclient_r. @@ -2030,6 +1981,8 @@ Optional Features: --enable-load-tester enable load testing plugin for IKEv2 daemon. --enable-eap-sim enable SIM authentication module for EAP. --enable-eap-sim-file enable EAP-SIM backend based on a triplet file. + --enable-eap-sim-pcsc enable EAP-SIM backend based on a smartcard reader. + Requires libpcsclite. --enable-eap-simaka-sql enable EAP-SIM/AKA backend based on a triplet/quintuplet SQL database. --enable-eap-simaka-pseudonym @@ -2046,16 +1999,14 @@ Optional Features: --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-radius enable RADIUS proxy authentication module. --enable-tnc-imc enable TNC IMC module. --enable-tnc-imv enable TNC IMV module. --enable-tnccs-11 enable TNCCS 1.1 protocol module. --enable-tnccs-20 enable TNCCS 2.0 protocol module. -<<<<<<< HEAD -======= --enable-tnccs-dynamic enable dynamic TNCCS protocol discovery module. ->>>>>>> upstream/4.5.1 --disable-kernel-netlink disable the netlink kernel interface. --enable-kernel-pfkey enable the PF_KEY kernel interface. @@ -2091,10 +2042,7 @@ Optional Features: pki). --disable-scripts disable additional utilities (found in directory scripts). -<<<<<<< HEAD -======= --enable-conftest enforce Suite B conformance test framework. ->>>>>>> upstream/4.5.1 --disable-updown disable updown firewall script plugin. --disable-attr disable strongswan.conf based configuration attribute plugin. @@ -2115,8 +2063,13 @@ Optional Features: --enable-maemo enable Maemo specific plugin. --enable-nm enable NetworkManager plugin. --enable-ha enable high availability cluster plugin. + --enable-whitelist enable peer identity whitelisting plugin. --enable-led enable plugin to control LEDs on IKEv2 activity using the Linux kernel LED subsystem. + --enable-duplicheck advanced duplicate checking plugin using liveness + checks. + --enable-coupling enable IKEv2 plugin to couple peer certificates + permanently to authentication. --enable-vstr enforce using the Vstr string library to replace glibc-like printf hooks. --enable-monolithic build monolithic version of libstrongswan that @@ -2167,6 +2120,9 @@ Optional Packages: 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-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"). @@ -2197,11 +2153,8 @@ Some influential environment variables: YFLAGS The list of arguments that will be passed by default to $YACC. This script will default YFLAGS to the empty string to avoid a default value of `-d' given by some make applications. -<<<<<<< HEAD -======= soup_CFLAGS C compiler flags for soup, overriding pkg-config soup_LIBS linker flags for soup, overriding pkg-config ->>>>>>> upstream/4.5.1 xml_CFLAGS C compiler flags for xml, overriding pkg-config xml_LIBS linker flags for xml, overriding pkg-config gtk_CFLAGS C compiler flags for gtk, overriding pkg-config @@ -2209,6 +2162,10 @@ Some influential environment variables: maemo_CFLAGS C compiler flags for maemo, overriding pkg-config maemo_LIBS linker flags for maemo, overriding pkg-config + pcsclite_CFLAGS + C compiler flags for pcsclite, overriding pkg-config + pcsclite_LIBS + linker flags for pcsclite, overriding pkg-config nm_CFLAGS C compiler flags for nm, overriding pkg-config nm_LIBS linker flags for nm, overriding pkg-config @@ -2278,11 +2235,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -<<<<<<< HEAD -strongSwan configure 4.5.0 -======= -strongSwan configure 4.5.1 ->>>>>>> upstream/4.5.1 +strongSwan configure 4.5.2 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2758,11 +2711,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -<<<<<<< HEAD -It was created by strongSwan $as_me 4.5.0, which was -======= -It was created by strongSwan $as_me 4.5.1, which was ->>>>>>> upstream/4.5.1 +It was created by strongSwan $as_me 4.5.2, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3577,11 +3526,7 @@ fi # Define the identity of the package. PACKAGE='strongswan' -<<<<<<< HEAD - VERSION='4.5.0' -======= - VERSION='4.5.1' ->>>>>>> upstream/4.5.1 + VERSION='4.5.2' cat >>confdefs.h <<_ACEOF @@ -4002,6 +3947,29 @@ fi +if test -n "$PKG_CONFIG"; then + systemdsystemunitdir_default=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) +fi + +# Check whether --with-systemdsystemunitdir was given. +if test "${with_systemdsystemunitdir+set}" = set; then : + withval=$with_systemdsystemunitdir; systemdsystemunitdir="$withval" +else + systemdsystemunitdir=$systemdsystemunitdir_default + +fi + + + if test -n "$systemdsystemunitdir" -a "x$systemdsystemunitdir" != xno; then + HAVE_SYSTEMD_TRUE= + HAVE_SYSTEMD_FALSE='#' +else + HAVE_SYSTEMD_TRUE='#' + HAVE_SYSTEMD_FALSE= +fi + + + # Check whether --with-xauth-module was given. if test "${with_xauth_module+set}" = set; then : @@ -4069,8 +4037,6 @@ else fi -<<<<<<< HEAD -======= # Check whether --enable-soup was given. if test "${enable_soup+set}" = set; then : enableval=$enable_soup; soup_given=true @@ -4086,7 +4052,6 @@ else fi ->>>>>>> upstream/4.5.1 # Check whether --enable-ldap was given. if test "${enable_ldap+set}" = set; then : enableval=$enable_ldap; ldap_given=true @@ -4282,8 +4247,6 @@ else fi -<<<<<<< HEAD -======= # Check whether --enable-constraints was given. if test "${enable_constraints+set}" = set; then : enableval=$enable_constraints; constraints_given=true @@ -4299,7 +4262,6 @@ else fi ->>>>>>> upstream/4.5.1 # Check whether --enable-pubkey was given. if test "${enable_pubkey+set}" = set; then : enableval=$enable_pubkey; pubkey_given=true @@ -4405,8 +4367,6 @@ else fi -<<<<<<< HEAD -======= # Check whether --enable-af-alg was given. if test "${enable_af_alg+set}" = set; then : enableval=$enable_af_alg; af_alg_given=true @@ -4422,7 +4382,6 @@ else fi ->>>>>>> upstream/4.5.1 # Check whether --enable-test-vectors was given. if test "${enable_test_vectors+set}" = set; then : enableval=$enable_test_vectors; test_vectors_given=true @@ -4663,6 +4622,21 @@ else fi +# Check whether --enable-eap-sim-pcsc was given. +if test "${enable_eap_sim_pcsc+set}" = set; then : + enableval=$enable_eap_sim_pcsc; eap_sim_pcsc_given=true + if test x$enableval = xyes; then + eap_sim_pcsc=true + else + eap_sim_pcsc=false + fi +else + eap_sim_pcsc=false + eap_sim_pcsc_given=false + +fi + + # Check whether --enable-eap-simaka-sql was given. if test "${enable_eap_simaka_sql+set}" = set; then : enableval=$enable_eap_simaka_sql; eap_simaka_sql_given=true @@ -4828,6 +4802,21 @@ else fi +# Check whether --enable-eap-peap was given. +if test "${enable_eap_peap+set}" = set; then : + enableval=$enable_eap_peap; eap_peap_given=true + if test x$enableval = xyes; then + eap_peap=true + else + eap_peap=false + fi +else + eap_peap=false + eap_peap_given=false + +fi + + # Check whether --enable-eap-tnc was given. if test "${enable_eap_tnc+set}" = set; then : enableval=$enable_eap_tnc; eap_tnc_given=true @@ -4918,8 +4907,6 @@ else fi -<<<<<<< HEAD -======= # Check whether --enable-tnccs-dynamic was given. if test "${enable_tnccs_dynamic+set}" = set; then : enableval=$enable_tnccs_dynamic; tnccs_dynamic_given=true @@ -4935,7 +4922,6 @@ else fi ->>>>>>> upstream/4.5.1 # Check whether --enable-kernel-netlink was given. if test "${enable_kernel_netlink+set}" = set; then : enableval=$enable_kernel_netlink; kernel_netlink_given=true @@ -5281,8 +5267,6 @@ else fi -<<<<<<< HEAD -======= # Check whether --enable-conftest was given. if test "${enable_conftest+set}" = set; then : enableval=$enable_conftest; conftest_given=true @@ -5298,7 +5282,6 @@ else fi ->>>>>>> upstream/4.5.1 # Check whether --enable-updown was given. if test "${enable_updown+set}" = set; then : enableval=$enable_updown; updown_given=true @@ -5584,6 +5567,21 @@ else fi +# Check whether --enable-whitelist was given. +if test "${enable_whitelist+set}" = set; then : + enableval=$enable_whitelist; whitelist_given=true + if test x$enableval = xyes; then + whitelist=true + else + whitelist=false + fi +else + whitelist=false + whitelist_given=false + +fi + + # Check whether --enable-led was given. if test "${enable_led+set}" = set; then : enableval=$enable_led; led_given=true @@ -5599,6 +5597,36 @@ else fi +# Check whether --enable-duplicheck was given. +if test "${enable_duplicheck+set}" = set; then : + enableval=$enable_duplicheck; duplicheck_given=true + if test x$enableval = xyes; then + duplicheck=true + else + duplicheck=false + fi +else + duplicheck=false + duplicheck_given=false + +fi + + +# Check whether --enable-coupling was given. +if test "${enable_coupling+set}" = set; then : + enableval=$enable_coupling; coupling_given=true + if test x$enableval = xyes; then + coupling=true + else + coupling=false + fi +else + coupling=false + coupling_given=false + +fi + + # Check whether --enable-vstr was given. if test "${enable_vstr+set}" = set; then : enableval=$enable_vstr; vstr_given=true @@ -7981,23 +8009,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 -<<<<<<< HEAD - (eval echo "\"\$as_me:7772: $ac_compile\"" >&5) + (eval echo "\"\$as_me:8012: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:7775: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:8015: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:7778: output\"" >&5) -======= - (eval echo "\"\$as_me:7876: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 - (eval echo "\"\$as_me:7879: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 - (eval echo "\"\$as_me:7882: output\"" >&5) ->>>>>>> upstream/4.5.1 + (eval echo "\"\$as_me:8018: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -9202,11 +9220,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. -<<<<<<< HEAD - echo '#line 8983 "configure"' > conftest.$ac_ext -======= - echo '#line 9087 "configure"' > conftest.$ac_ext ->>>>>>> upstream/4.5.1 + echo '#line 9223 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10468,19 +10482,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -<<<<<<< HEAD - (eval echo "\"\$as_me:10245: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:10249: \$? = $ac_status" >&5 -======= - (eval echo "\"\$as_me:10349: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10485: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10353: \$? = $ac_status" >&5 ->>>>>>> upstream/4.5.1 + echo "$as_me:10489: \$? = $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. @@ -10815,19 +10821,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -<<<<<<< HEAD - (eval echo "\"\$as_me:10584: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10824: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10588: \$? = $ac_status" >&5 -======= - (eval echo "\"\$as_me:10688: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:10692: \$? = $ac_status" >&5 ->>>>>>> upstream/4.5.1 + echo "$as_me:10828: \$? = $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. @@ -10928,19 +10926,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -<<<<<<< HEAD - (eval echo "\"\$as_me:10689: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10929: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10693: \$? = $ac_status" >&5 -======= - (eval echo "\"\$as_me:10793: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:10797: \$? = $ac_status" >&5 ->>>>>>> upstream/4.5.1 + echo "$as_me:10933: \$? = $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 @@ -10991,19 +10981,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -<<<<<<< HEAD - (eval echo "\"\$as_me:10744: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:10748: \$? = $ac_status" >&5 -======= - (eval echo "\"\$as_me:10848: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10984: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10852: \$? = $ac_status" >&5 ->>>>>>> upstream/4.5.1 + echo "$as_me:10988: \$? = $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 @@ -13383,11 +13365,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -<<<<<<< HEAD -#line 13128 "configure" -======= -#line 13232 "configure" ->>>>>>> upstream/4.5.1 +#line 13368 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13483,11 +13461,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -<<<<<<< HEAD -#line 13224 "configure" -======= -#line 13328 "configure" ->>>>>>> upstream/4.5.1 +#line 13464 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14121,30 +14095,6 @@ else $as_echo "not found" >&6; } fi -<<<<<<< HEAD -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid of user \"$ipsecuser\"" >&5 -$as_echo_n "checking for uid of user \"$ipsecuser\"... " >&6; } -ipsecuid=`id -u $ipsecuser 2>/dev/null` -if test -n "$ipsecuid"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipsecuid" >&5 -$as_echo "$ipsecuid" >&6; } - -else - as_fn_error $? "not found" "$LINENO" 5 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gid of group \"$ipsecgroup\"" >&5 -$as_echo_n "checking for gid of group \"$ipsecgroup\"... " >&6; } -ipsecgid=`$EGREP "^$ipsecgroup:" /etc/group | $AWK -F: '{ print $3 }'` -if test -n "$ipsecgid"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipsecgid" >&5 -$as_echo "$ipsecgid" >&6; } - -else - as_fn_error $? "not found" "$LINENO" 5 -fi - -======= ->>>>>>> upstream/4.5.1 if test x$eap_aka_3gpp2 = xtrue; then gmp=true; @@ -14160,7 +14110,7 @@ if test x$eap_sim = xtrue; then simaka=true; fi -if test x$eap_tls = xtrue -o x$eap_ttls = xtrue; then +if test x$eap_tls = xtrue -o x$eap_ttls = xtrue -o x$eap_peap = xtrue; then tls=true; fi @@ -14170,11 +14120,7 @@ if test x$fips_prf = xtrue; then fi fi -<<<<<<< HEAD -if test x$smp = xtrue; then -======= if test x$smp = xtrue -o x$tnccs_11 = xtrue; then ->>>>>>> upstream/4.5.1 xml=true fi @@ -15003,12 +14949,13 @@ fi done -for ac_header in sys/sockio.h +for ac_header in sys/sockio.h glob.h do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_sockio_h" = x""yes; then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_SOCKIO_H 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -15520,8 +15467,6 @@ fi fi -<<<<<<< HEAD -======= if test x$soup = xtrue; then pkg_failed=no @@ -15616,7 +15561,6 @@ fi fi ->>>>>>> upstream/4.5.1 if test x$xml = xtrue; then pkg_failed=no @@ -16301,20 +16245,6 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -<<<<<<< HEAD -if test x$tnccs_11 = xtrue -o x$tnc_imc = xtrue -o x$tnc_imv = xtrue; then - ac_fn_c_check_header_mongrel "$LINENO" "libtnc.h" "ac_cv_header_libtnc_h" "$ac_includes_default" -if test "x$ac_cv_header_libtnc_h" = x""yes; then : - -else - as_fn_error $? "libtnc header libtnc.h not found!" "$LINENO" 5 -fi - - -fi - -======= ->>>>>>> upstream/4.5.1 if test x$uci = xtrue; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -luci" >&5 $as_echo_n "checking for main in -luci... " >&6; } @@ -16509,6 +16439,100 @@ fi fi +if test x$eap_sim_pcsc = xtrue; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcsclite" >&5 +$as_echo_n "checking for pcsclite... " >&6; } + +if test -n "$pcsclite_CFLAGS"; then + pkg_cv_pcsclite_CFLAGS="$pcsclite_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcsclite\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpcsclite") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_pcsclite_CFLAGS=`$PKG_CONFIG --cflags "libpcsclite" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$pcsclite_LIBS"; then + pkg_cv_pcsclite_LIBS="$pcsclite_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcsclite\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpcsclite") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_pcsclite_LIBS=`$PKG_CONFIG --libs "libpcsclite" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + pcsclite_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpcsclite" 2>&1` + else + pcsclite_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpcsclite" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$pcsclite_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (libpcsclite) were not met: + +$pcsclite_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables pcsclite_CFLAGS +and pcsclite_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables pcsclite_CFLAGS +and pcsclite_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details" "$LINENO" 5 ; } +else + pcsclite_CFLAGS=$pkg_cv_pcsclite_CFLAGS + pcsclite_LIBS=$pkg_cv_pcsclite_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + +fi + if test x$nm = xtrue; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-glib\""; } >&5 @@ -16917,8 +16941,6 @@ if test x$curl = xtrue; then libcharon_plugins=${libcharon_plugins}" curl" pluto_plugins=${pluto_plugins}" curl" scepclient_plugins=${scepclient_plugins}" curl" -<<<<<<< HEAD -======= scripts_plugins=${scripts_plugins}" curl" fi @@ -16928,7 +16950,6 @@ if test x$soup = xtrue; then libcharon_plugins=${libcharon_plugins}" soup" pluto_plugins=${pluto_plugins}" soup" scripts_plugins=${scripts_plugins}" soup" ->>>>>>> upstream/4.5.1 fi @@ -16937,10 +16958,7 @@ if test x$ldap = xtrue; then libcharon_plugins=${libcharon_plugins}" ldap" pluto_plugins=${pluto_plugins}" ldap" scepclient_plugins=${scepclient_plugins}" ldap" -<<<<<<< HEAD -======= scripts_plugins=${scripts_plugins}" ldap" ->>>>>>> upstream/4.5.1 fi @@ -17070,15 +17088,12 @@ if test x$revocation = xtrue; then fi -<<<<<<< HEAD -======= if test x$constraints = xtrue; then s_plugins=${s_plugins}" constraints" libcharon_plugins=${libcharon_plugins}" constraints" fi ->>>>>>> upstream/4.5.1 if test x$pubkey = xtrue; then s_plugins=${s_plugins}" pubkey" libcharon_plugins=${libcharon_plugins}" pubkey" @@ -17223,8 +17238,6 @@ if test x$gcm = xtrue; then fi -<<<<<<< HEAD -======= if test x$af_alg = xtrue; then s_plugins=${s_plugins}" af-alg" libcharon_plugins=${libcharon_plugins}" af-alg" @@ -17237,7 +17250,6 @@ if test x$af_alg = xtrue; then fi ->>>>>>> upstream/4.5.1 if test x$xauth = xtrue; then p_plugins=${p_plugins}" xauth" pluto_plugins=${pluto_plugins}" xauth" @@ -17258,15 +17270,12 @@ if test x$attr_sql = xtrue; then fi -<<<<<<< HEAD -======= if test x$load_tester = xtrue; then c_plugins=${c_plugins}" load-tester" libcharon_plugins=${libcharon_plugins}" load-tester" fi ->>>>>>> upstream/4.5.1 if test x$kernel_pfkey = xtrue; then h_plugins=${h_plugins}" kernel-pfkey" libcharon_plugins=${libcharon_plugins}" kernel-pfkey" @@ -17302,15 +17311,6 @@ if test x$resolve = xtrue; then fi -<<<<<<< HEAD -if test x$load_tester = xtrue; then - c_plugins=${c_plugins}" load-tester" - libcharon_plugins=${libcharon_plugins}" load-tester" - - fi - -======= ->>>>>>> upstream/4.5.1 if test x$socket_default = xtrue; then c_plugins=${c_plugins}" socket-default" libcharon_plugins=${libcharon_plugins}" socket-default" @@ -17377,6 +17377,12 @@ if test x$eap_sim_file = xtrue; then fi +if test x$eap_sim_pcsc = xtrue; then + c_plugins=${c_plugins}" eap-sim-pcsc" + libcharon_plugins=${libcharon_plugins}" eap-sim-pcsc" + + fi + if test x$eap_simaka_sql = xtrue; then c_plugins=${c_plugins}" eap-simaka-sql" libcharon_plugins=${libcharon_plugins}" eap-simaka-sql" @@ -17443,27 +17449,21 @@ if test x$eap_ttls = xtrue; then fi -if test x$eap_tnc = xtrue; then - c_plugins=${c_plugins}" eap-tnc" - libcharon_plugins=${libcharon_plugins}" eap-tnc" +if test x$eap_peap = xtrue; then + c_plugins=${c_plugins}" eap-peap" + libcharon_plugins=${libcharon_plugins}" eap-peap" fi -<<<<<<< HEAD -if test x$tnc_imc = xtrue; then - c_plugins=${c_plugins}" tnc-imc" - libcharon_plugins=${libcharon_plugins}" tnc-imc" +if test x$eap_tnc = xtrue; then + c_plugins=${c_plugins}" eap-tnc" + libcharon_plugins=${libcharon_plugins}" eap-tnc" fi -if test x$tnc_imv = xtrue; then - c_plugins=${c_plugins}" tnc-imv" - libcharon_plugins=${libcharon_plugins}" tnc-imv" -======= if test x$tnccs_20 = xtrue; then c_plugins=${c_plugins}" tnccs-20" libcharon_plugins=${libcharon_plugins}" tnccs-20" ->>>>>>> upstream/4.5.1 fi @@ -17473,11 +17473,6 @@ if test x$tnccs_11 = xtrue; then fi -<<<<<<< HEAD -if test x$tnccs_20 = xtrue; then - c_plugins=${c_plugins}" tnccs-20" - libcharon_plugins=${libcharon_plugins}" tnccs-20" -======= if test x$tnccs_dynamic = xtrue; then c_plugins=${c_plugins}" tnccs-dynamic" libcharon_plugins=${libcharon_plugins}" tnccs-dynamic" @@ -17493,7 +17488,6 @@ if test x$tnc_imc = xtrue; then if test x$tnc_imv = xtrue; then c_plugins=${c_plugins}" tnc-imv" libcharon_plugins=${libcharon_plugins}" tnc-imv" ->>>>>>> upstream/4.5.1 fi @@ -17533,12 +17527,30 @@ if test x$ha = xtrue; then fi +if test x$whitelist = xtrue; then + c_plugins=${c_plugins}" whitelist" + libcharon_plugins=${libcharon_plugins}" whitelist" + + fi + if test x$led = xtrue; then c_plugins=${c_plugins}" led" libcharon_plugins=${libcharon_plugins}" led" fi +if test x$duplicheck = xtrue; then + c_plugins=${c_plugins}" duplicheck" + libcharon_plugins=${libcharon_plugins}" duplicheck" + + fi + +if test x$coupling = xtrue; then + c_plugins=${c_plugins}" coupling" + libcharon_plugins=${libcharon_plugins}" coupling" + + fi + if test x$maemo = xtrue; then c_plugins=${c_plugins}" maemo" libcharon_plugins=${libcharon_plugins}" maemo" @@ -17596,8 +17608,6 @@ else USE_CURL_FALSE= fi -<<<<<<< HEAD -======= if test x$soup = xtrue; then USE_SOUP_TRUE= USE_SOUP_FALSE='#' @@ -17606,7 +17616,6 @@ else USE_SOUP_FALSE= fi ->>>>>>> upstream/4.5.1 if test x$ldap = xtrue; then USE_LDAP_TRUE= USE_LDAP_FALSE='#' @@ -17711,8 +17720,6 @@ else USE_REVOCATION_FALSE= fi -<<<<<<< HEAD -======= if test x$constraints = xtrue; then USE_CONSTRAINTS_TRUE= USE_CONSTRAINTS_FALSE='#' @@ -17721,7 +17728,6 @@ else USE_CONSTRAINTS_FALSE= fi ->>>>>>> upstream/4.5.1 if test x$pubkey = xtrue; then USE_PUBKEY_TRUE= USE_PUBKEY_FALSE='#' @@ -17858,8 +17864,6 @@ else USE_GCM_FALSE= fi -<<<<<<< HEAD -======= if test x$af_alg = xtrue; then USE_AF_ALG_TRUE= USE_AF_ALG_FALSE='#' @@ -17868,7 +17872,6 @@ else USE_AF_ALG_FALSE= fi ->>>>>>> upstream/4.5.1 if test x$stroke = xtrue; then USE_STROKE_TRUE= @@ -17982,6 +17985,14 @@ else USE_HA_FALSE= fi + if test x$whitelist = xtrue; then + USE_WHITELIST_TRUE= + USE_WHITELIST_FALSE='#' +else + USE_WHITELIST_TRUE='#' + USE_WHITELIST_FALSE= +fi + if test x$led = xtrue; then USE_LED_TRUE= USE_LED_FALSE='#' @@ -17990,6 +18001,22 @@ else USE_LED_FALSE= fi + if test x$duplicheck = xtrue; then + USE_DUPLICHECK_TRUE= + USE_DUPLICHECK_FALSE='#' +else + USE_DUPLICHECK_TRUE='#' + USE_DUPLICHECK_FALSE= +fi + + if test x$coupling = xtrue; then + USE_COUPLING_TRUE= + USE_COUPLING_FALSE='#' +else + USE_COUPLING_TRUE='#' + USE_COUPLING_FALSE= +fi + if test x$eap_sim = xtrue; then USE_EAP_SIM_TRUE= USE_EAP_SIM_FALSE='#' @@ -18006,6 +18033,14 @@ else USE_EAP_SIM_FILE_FALSE= fi + if test x$eap_sim_pcsc = xtrue; then + USE_EAP_SIM_PCSC_TRUE= + USE_EAP_SIM_PCSC_FALSE='#' +else + USE_EAP_SIM_PCSC_TRUE='#' + USE_EAP_SIM_PCSC_FALSE= +fi + if test x$eap_simaka_sql = xtrue; then USE_EAP_SIMAKA_SQL_TRUE= USE_EAP_SIMAKA_SQL_FALSE='#' @@ -18094,6 +18129,14 @@ else USE_EAP_TTLS_FALSE= fi + if test x$eap_peap = xtrue; then + USE_EAP_PEAP_TRUE= + USE_EAP_PEAP_FALSE='#' +else + USE_EAP_PEAP_TRUE='#' + USE_EAP_PEAP_FALSE= +fi + if test x$eap_tnc = xtrue; then USE_EAP_TNC_TRUE= USE_EAP_TNC_FALSE='#' @@ -18142,8 +18185,6 @@ else USE_TNCCS_20_FALSE= fi -<<<<<<< HEAD -======= if test x$tnccs_dynamic = xtrue; then USE_TNCCS_DYNAMIC_TRUE= USE_TNCCS_DYNAMIC_FALSE='#' @@ -18152,7 +18193,6 @@ else USE_TNCCS_DYNAMIC_FALSE= fi ->>>>>>> upstream/4.5.1 if test x$socket_default = xtrue; then USE_SOCKET_DEFAULT_TRUE= USE_SOCKET_DEFAULT_FALSE='#' @@ -18404,9 +18444,6 @@ else USE_SCRIPTS_FALSE= fi -<<<<<<< HEAD - if test x$charon = xtrue -o x$pluto = xtrue -o x$tools = xtrue; then -======= if test x$conftest = xtrue; then USE_CONFTEST_TRUE= USE_CONFTEST_FALSE='#' @@ -18416,7 +18453,6 @@ else fi if test x$charon = xtrue -o x$pluto = xtrue -o x$tools = xtrue -o x$conftest = xtrue; then ->>>>>>> upstream/4.5.1 USE_LIBSTRONGSWAN_TRUE= USE_LIBSTRONGSWAN_FALSE='#' else @@ -18432,8 +18468,6 @@ else USE_LIBHYDRA_FALSE= fi -<<<<<<< HEAD -======= if test x$charon = xtrue -o x$conftest = xtrue; then USE_LIBCHARON_TRUE= USE_LIBCHARON_FALSE='#' @@ -18442,7 +18476,6 @@ else USE_LIBCHARON_FALSE= fi ->>>>>>> upstream/4.5.1 if test x$pluto = xtrue -o x$stroke = xtrue; then USE_FILE_CONFIG_TRUE= USE_FILE_CONFIG_FALSE='#' @@ -18451,8 +18484,6 @@ else USE_FILE_CONFIG_FALSE= fi -<<<<<<< HEAD -======= if test x$pluto = xtrue -o x$stroke = xtrue -o x$tools = xtrue -o x$conftest = xtrue; then USE_IPSEC_SCRIPT_TRUE= USE_IPSEC_SCRIPT_FALSE='#' @@ -18461,7 +18492,6 @@ else USE_IPSEC_SCRIPT_FALSE= fi ->>>>>>> upstream/4.5.1 if test x$capabilities = xlibcap; then USE_LIBCAP_TRUE= USE_LIBCAP_FALSE='#' @@ -18519,11 +18549,7 @@ fi -<<<<<<< HEAD -ac_config_files="$ac_config_files Makefile man/Makefile src/Makefile src/include/Makefile src/libstrongswan/Makefile src/libstrongswan/plugins/aes/Makefile src/libstrongswan/plugins/des/Makefile src/libstrongswan/plugins/blowfish/Makefile src/libstrongswan/plugins/md4/Makefile src/libstrongswan/plugins/md5/Makefile src/libstrongswan/plugins/sha1/Makefile src/libstrongswan/plugins/sha2/Makefile src/libstrongswan/plugins/fips_prf/Makefile src/libstrongswan/plugins/gmp/Makefile src/libstrongswan/plugins/random/Makefile src/libstrongswan/plugins/hmac/Makefile src/libstrongswan/plugins/xcbc/Makefile src/libstrongswan/plugins/x509/Makefile src/libstrongswan/plugins/revocation/Makefile src/libstrongswan/plugins/pubkey/Makefile src/libstrongswan/plugins/pkcs1/Makefile src/libstrongswan/plugins/pgp/Makefile src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/Makefile src/libstrongswan/plugins/ldap/Makefile src/libstrongswan/plugins/mysql/Makefile src/libstrongswan/plugins/sqlite/Makefile src/libstrongswan/plugins/padlock/Makefile src/libstrongswan/plugins/openssl/Makefile src/libstrongswan/plugins/gcrypt/Makefile src/libstrongswan/plugins/agent/Makefile src/libstrongswan/plugins/pkcs11/Makefile src/libstrongswan/plugins/ctr/Makefile src/libstrongswan/plugins/ccm/Makefile src/libstrongswan/plugins/gcm/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/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_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_tnc/Makefile src/libcharon/plugins/eap_radius/Makefile src/libcharon/plugins/tnc_imc/Makefile src/libcharon/plugins/tnc_imv/Makefile src/libcharon/plugins/tnccs_11/Makefile src/libcharon/plugins/tnccs_20/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/led/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 scripts/Makefile testing/Makefile" -======= -ac_config_files="$ac_config_files Makefile man/Makefile src/Makefile src/include/Makefile src/libstrongswan/Makefile src/libstrongswan/plugins/aes/Makefile src/libstrongswan/plugins/des/Makefile src/libstrongswan/plugins/blowfish/Makefile src/libstrongswan/plugins/md4/Makefile src/libstrongswan/plugins/md5/Makefile src/libstrongswan/plugins/sha1/Makefile src/libstrongswan/plugins/sha2/Makefile src/libstrongswan/plugins/fips_prf/Makefile src/libstrongswan/plugins/gmp/Makefile src/libstrongswan/plugins/random/Makefile src/libstrongswan/plugins/hmac/Makefile src/libstrongswan/plugins/xcbc/Makefile src/libstrongswan/plugins/x509/Makefile src/libstrongswan/plugins/revocation/Makefile src/libstrongswan/plugins/constraints/Makefile src/libstrongswan/plugins/pubkey/Makefile src/libstrongswan/plugins/pkcs1/Makefile src/libstrongswan/plugins/pgp/Makefile src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/Makefile src/libstrongswan/plugins/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/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_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_tnc/Makefile src/libcharon/plugins/eap_radius/Makefile src/libcharon/plugins/tnc_imc/Makefile src/libcharon/plugins/tnc_imv/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/led/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" ->>>>>>> upstream/4.5.1 +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/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/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/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_imc/Makefile src/libcharon/plugins/tnc_imv/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/led/Makefile src/libcharon/plugins/duplicheck/Makefile src/libcharon/plugins/coupling/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" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18667,6 +18693,10 @@ else am__EXEEXT_FALSE= fi +if test -z "${HAVE_SYSTEMD_TRUE}" && test -z "${HAVE_SYSTEMD_FALSE}"; then + as_fn_error $? "conditional \"HAVE_SYSTEMD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18684,13 +18714,10 @@ if test -z "${USE_CURL_TRUE}" && test -z "${USE_CURL_FALSE}"; then as_fn_error $? "conditional \"USE_CURL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -<<<<<<< HEAD -======= if test -z "${USE_SOUP_TRUE}" && test -z "${USE_SOUP_FALSE}"; then as_fn_error $? "conditional \"USE_SOUP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi ->>>>>>> upstream/4.5.1 if test -z "${USE_LDAP_TRUE}" && test -z "${USE_LDAP_FALSE}"; then as_fn_error $? "conditional \"USE_LDAP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18743,13 +18770,10 @@ if test -z "${USE_REVOCATION_TRUE}" && test -z "${USE_REVOCATION_FALSE}"; then as_fn_error $? "conditional \"USE_REVOCATION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -<<<<<<< HEAD -======= if test -z "${USE_CONSTRAINTS_TRUE}" && test -z "${USE_CONSTRAINTS_FALSE}"; then as_fn_error $? "conditional \"USE_CONSTRAINTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi ->>>>>>> upstream/4.5.1 if test -z "${USE_PUBKEY_TRUE}" && test -z "${USE_PUBKEY_FALSE}"; then as_fn_error $? "conditional \"USE_PUBKEY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18818,13 +18842,10 @@ if test -z "${USE_GCM_TRUE}" && test -z "${USE_GCM_FALSE}"; then as_fn_error $? "conditional \"USE_GCM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -<<<<<<< HEAD -======= if test -z "${USE_AF_ALG_TRUE}" && test -z "${USE_AF_ALG_FALSE}"; then as_fn_error $? "conditional \"USE_AF_ALG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi ->>>>>>> upstream/4.5.1 if test -z "${USE_STROKE_TRUE}" && test -z "${USE_STROKE_FALSE}"; then as_fn_error $? "conditional \"USE_STROKE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18881,10 +18902,22 @@ if test -z "${USE_HA_TRUE}" && test -z "${USE_HA_FALSE}"; then as_fn_error $? "conditional \"USE_HA\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_WHITELIST_TRUE}" && test -z "${USE_WHITELIST_FALSE}"; then + as_fn_error $? "conditional \"USE_WHITELIST\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_LED_TRUE}" && test -z "${USE_LED_FALSE}"; then as_fn_error $? "conditional \"USE_LED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_DUPLICHECK_TRUE}" && test -z "${USE_DUPLICHECK_FALSE}"; then + as_fn_error $? "conditional \"USE_DUPLICHECK\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${USE_COUPLING_TRUE}" && test -z "${USE_COUPLING_FALSE}"; then + as_fn_error $? "conditional \"USE_COUPLING\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_EAP_SIM_TRUE}" && test -z "${USE_EAP_SIM_FALSE}"; then as_fn_error $? "conditional \"USE_EAP_SIM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18893,6 +18926,10 @@ if test -z "${USE_EAP_SIM_FILE_TRUE}" && test -z "${USE_EAP_SIM_FILE_FALSE}"; th as_fn_error $? "conditional \"USE_EAP_SIM_FILE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_EAP_SIM_PCSC_TRUE}" && test -z "${USE_EAP_SIM_PCSC_FALSE}"; then + as_fn_error $? "conditional \"USE_EAP_SIM_PCSC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_EAP_SIMAKA_SQL_TRUE}" && test -z "${USE_EAP_SIMAKA_SQL_FALSE}"; then as_fn_error $? "conditional \"USE_EAP_SIMAKA_SQL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18937,6 +18974,10 @@ if test -z "${USE_EAP_TTLS_TRUE}" && test -z "${USE_EAP_TTLS_FALSE}"; then as_fn_error $? "conditional \"USE_EAP_TTLS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_EAP_PEAP_TRUE}" && test -z "${USE_EAP_PEAP_FALSE}"; then + as_fn_error $? "conditional \"USE_EAP_PEAP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi 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 @@ -18961,13 +19002,10 @@ if test -z "${USE_TNCCS_20_TRUE}" && test -z "${USE_TNCCS_20_FALSE}"; then as_fn_error $? "conditional \"USE_TNCCS_20\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -<<<<<<< HEAD -======= if test -z "${USE_TNCCS_DYNAMIC_TRUE}" && test -z "${USE_TNCCS_DYNAMIC_FALSE}"; then as_fn_error $? "conditional \"USE_TNCCS_DYNAMIC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi ->>>>>>> upstream/4.5.1 if test -z "${USE_SOCKET_DEFAULT_TRUE}" && test -z "${USE_SOCKET_DEFAULT_FALSE}"; then as_fn_error $? "conditional \"USE_SOCKET_DEFAULT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19092,13 +19130,10 @@ if test -z "${USE_SCRIPTS_TRUE}" && test -z "${USE_SCRIPTS_FALSE}"; then as_fn_error $? "conditional \"USE_SCRIPTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -<<<<<<< HEAD -======= if test -z "${USE_CONFTEST_TRUE}" && test -z "${USE_CONFTEST_FALSE}"; then as_fn_error $? "conditional \"USE_CONFTEST\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi ->>>>>>> upstream/4.5.1 if test -z "${USE_LIBSTRONGSWAN_TRUE}" && test -z "${USE_LIBSTRONGSWAN_FALSE}"; then as_fn_error $? "conditional \"USE_LIBSTRONGSWAN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19107,24 +19142,18 @@ if test -z "${USE_LIBHYDRA_TRUE}" && test -z "${USE_LIBHYDRA_FALSE}"; then as_fn_error $? "conditional \"USE_LIBHYDRA\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -<<<<<<< HEAD -======= 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 ->>>>>>> upstream/4.5.1 if test -z "${USE_FILE_CONFIG_TRUE}" && test -z "${USE_FILE_CONFIG_FALSE}"; then as_fn_error $? "conditional \"USE_FILE_CONFIG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -<<<<<<< HEAD -======= if test -z "${USE_IPSEC_SCRIPT_TRUE}" && test -z "${USE_IPSEC_SCRIPT_FALSE}"; then as_fn_error $? "conditional \"USE_IPSEC_SCRIPT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi ->>>>>>> upstream/4.5.1 if test -z "${USE_LIBCAP_TRUE}" && test -z "${USE_LIBCAP_FALSE}"; then as_fn_error $? "conditional \"USE_LIBCAP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19553,11 +19582,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=" -<<<<<<< HEAD -This file was extended by strongSwan $as_me 4.5.0, which was -======= -This file was extended by strongSwan $as_me 4.5.1, which was ->>>>>>> upstream/4.5.1 +This file was extended by strongSwan $as_me 4.5.2, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19614,11 +19639,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="\\ -<<<<<<< HEAD -strongSwan config.status 4.5.0 -======= -strongSwan config.status 4.5.1 ->>>>>>> upstream/4.5.1 +strongSwan config.status 4.5.2 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" @@ -19995,6 +20016,8 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; + "init/Makefile") CONFIG_FILES="$CONFIG_FILES init/Makefile" ;; + "init/systemd/Makefile") CONFIG_FILES="$CONFIG_FILES init/systemd/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/include/Makefile") CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;; "src/libstrongswan/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/Makefile" ;; @@ -20012,20 +20035,14 @@ do "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" ;; "src/libstrongswan/plugins/revocation/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/revocation/Makefile" ;; -<<<<<<< HEAD -======= "src/libstrongswan/plugins/constraints/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/constraints/Makefile" ;; ->>>>>>> upstream/4.5.1 "src/libstrongswan/plugins/pubkey/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pubkey/Makefile" ;; "src/libstrongswan/plugins/pkcs1/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pkcs1/Makefile" ;; "src/libstrongswan/plugins/pgp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pgp/Makefile" ;; "src/libstrongswan/plugins/dnskey/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/dnskey/Makefile" ;; "src/libstrongswan/plugins/pem/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pem/Makefile" ;; "src/libstrongswan/plugins/curl/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/curl/Makefile" ;; -<<<<<<< HEAD -======= "src/libstrongswan/plugins/soup/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/soup/Makefile" ;; ->>>>>>> upstream/4.5.1 "src/libstrongswan/plugins/ldap/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/ldap/Makefile" ;; "src/libstrongswan/plugins/mysql/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/mysql/Makefile" ;; "src/libstrongswan/plugins/sqlite/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/sqlite/Makefile" ;; @@ -20037,10 +20054,7 @@ do "src/libstrongswan/plugins/ctr/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/ctr/Makefile" ;; "src/libstrongswan/plugins/ccm/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/ccm/Makefile" ;; "src/libstrongswan/plugins/gcm/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/gcm/Makefile" ;; -<<<<<<< HEAD -======= "src/libstrongswan/plugins/af_alg/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/af_alg/Makefile" ;; ->>>>>>> upstream/4.5.1 "src/libstrongswan/plugins/test_vectors/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/test_vectors/Makefile" ;; "src/libhydra/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/Makefile" ;; "src/libhydra/plugins/attr/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/plugins/attr/Makefile" ;; @@ -20065,22 +20079,21 @@ do "src/libcharon/plugins/eap_gtc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_gtc/Makefile" ;; "src/libcharon/plugins/eap_sim/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_sim/Makefile" ;; "src/libcharon/plugins/eap_sim_file/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_sim_file/Makefile" ;; + "src/libcharon/plugins/eap_sim_pcsc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_sim_pcsc/Makefile" ;; "src/libcharon/plugins/eap_simaka_sql/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_simaka_sql/Makefile" ;; "src/libcharon/plugins/eap_simaka_pseudonym/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_simaka_pseudonym/Makefile" ;; "src/libcharon/plugins/eap_simaka_reauth/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_simaka_reauth/Makefile" ;; "src/libcharon/plugins/eap_mschapv2/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_mschapv2/Makefile" ;; "src/libcharon/plugins/eap_tls/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_tls/Makefile" ;; "src/libcharon/plugins/eap_ttls/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_ttls/Makefile" ;; + "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/tnc_imc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnc_imc/Makefile" ;; "src/libcharon/plugins/tnc_imv/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnc_imv/Makefile" ;; "src/libcharon/plugins/tnccs_11/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnccs_11/Makefile" ;; "src/libcharon/plugins/tnccs_20/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnccs_20/Makefile" ;; -<<<<<<< HEAD -======= "src/libcharon/plugins/tnccs_dynamic/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnccs_dynamic/Makefile" ;; ->>>>>>> upstream/4.5.1 "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" ;; @@ -20093,7 +20106,10 @@ do "src/libcharon/plugins/addrblock/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/addrblock/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" ;; "src/libcharon/plugins/led/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/led/Makefile" ;; + "src/libcharon/plugins/duplicheck/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/duplicheck/Makefile" ;; + "src/libcharon/plugins/coupling/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/coupling/Makefile" ;; "src/libcharon/plugins/android/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/android/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" ;; @@ -20116,10 +20132,7 @@ do "src/manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/manager/Makefile" ;; "src/medsrv/Makefile") CONFIG_FILES="$CONFIG_FILES src/medsrv/Makefile" ;; "src/checksum/Makefile") CONFIG_FILES="$CONFIG_FILES src/checksum/Makefile" ;; -<<<<<<< HEAD -======= "src/conftest/Makefile") CONFIG_FILES="$CONFIG_FILES src/conftest/Makefile" ;; ->>>>>>> upstream/4.5.1 "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; "testing/Makefile") CONFIG_FILES="$CONFIG_FILES testing/Makefile" ;; |