diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 446 |
1 files changed, 256 insertions, 190 deletions
diff --git a/configure.in b/configure.in index 9a9796e81..d4d54e3ce 100644 --- a/configure.in +++ b/configure.in @@ -16,9 +16,11 @@ dnl =========================== dnl initialize & set some vars dnl =========================== -AC_INIT(strongSwan,4.6.4) +AC_INIT(strongSwan,5.0.1) AM_INIT_AUTOMAKE(tar-ustar) AC_CONFIG_MACRO_DIR([m4/config]) +AC_CONFIG_HEADERS([config.h]) +AC_DEFINE([CONFIG_H_INCLUDED], [], [defined if config.h included]) PKG_PROG_PKG_CONFIG dnl ================================= @@ -27,7 +29,6 @@ dnl ================================= m4_include(m4/macros/with.m4) -ARG_WITH_SUBST([default-pkcs11], [/usr/lib/opensc-pkcs11.so], [set the default PKCS11 library]) ARG_WITH_SUBST([random-device], [/dev/random], [set the device to read real random data from]) ARG_WITH_SUBST([urandom-device], [/dev/urandom], [set the device to read pseudo random data from]) ARG_WITH_SUBST([strongswan-conf], [${sysconfdir}/strongswan.conf], [set the strongswan.conf file location]) @@ -37,13 +38,15 @@ ARG_WITH_SUBST([ipsecdir], [${libexecdir%/}/ipsec], [set installation ARG_WITH_SUBST([ipseclibdir], [${libdir%/}/ipsec], [set installation path for ipsec libraries]) ARG_WITH_SUBST([plugindir], [${ipseclibdir%/}/plugins], [set the installation path of plugins]) ARG_WITH_SUBST([imcvdir], [${ipseclibdir%/}/imcvs], [set the installation path of IMC and IMV dynamic librariers]) -ARG_WITH_SUBST([nm-ca-dir], [/usr/share/ca-certificates], [directory the NM plugin uses to look up trusted root certificates]) +ARG_WITH_SUBST([nm-ca-dir], [/usr/share/ca-certificates], [directory the NM backend uses to look up trusted root certificates]) ARG_WITH_SUBST([linux-headers], [\${top_srcdir}/src/include], [set directory of linux header files to use]) ARG_WITH_SUBST([routing-table], [220], [set routing table to use for IPsec routes]) ARG_WITH_SUBST([routing-table-prio], [220], [set priority for IPsec routing table]) +ARG_WITH_SUBST([ipsec-script], [ipsec], [change the name of the ipsec script]) ARG_WITH_SET([capabilities], [no], [set capability dropping library. Currently supported values are "libcap" and "native"]) ARG_WITH_SET([mpz_powm_sec], [yes], [use the more side-channel resistant mpz_powm_sec in libgmp, if available]) +ARG_WITH_SET([dev-headers], [no], [install strongSwan development headers to directory.]) if test -n "$PKG_CONFIG"; then systemdsystemunitdir_default=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) @@ -53,25 +56,47 @@ AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$systemdsystemunitdir" -a "x$systemdsyste AC_SUBST(systemdsystemunitdir) AC_ARG_WITH( - [xauth-module], - AS_HELP_STRING([--with-xauth-module=lib],[set the path to the XAUTH module]), - [AC_DEFINE_UNQUOTED(XAUTH_DEFAULT_LIB, "$withval")], -) - -AC_ARG_WITH( [user], AS_HELP_STRING([--with-user=user],[change user of the daemons to "user" after startup (default is "root").]), - [AC_DEFINE_UNQUOTED(IPSEC_USER, "$withval") AC_SUBST(ipsecuser, "$withval")], + [AC_DEFINE_UNQUOTED([IPSEC_USER], "$withval", [username to run daemon with]) + AC_SUBST(ipsecuser, "$withval")], [AC_SUBST(ipsecuser, "root")] ) AC_ARG_WITH( [group], AS_HELP_STRING([--with-group=group],[change group of the daemons to "group" after startup (default is "root").]), - [AC_DEFINE_UNQUOTED(IPSEC_GROUP, "$withval") AC_SUBST(ipsecgroup, "$withval")], + [AC_DEFINE_UNQUOTED(IPSEC_GROUP, "$withval", [groupname to run daemon with]) + AC_SUBST(ipsecgroup, "$withval")], [AC_SUBST(ipsecgroup, "root")] ) +AC_ARG_WITH( + [charon-udp-port], + AS_HELP_STRING([--with-charon-udp-port=port],[UDP port used by charon locally (default 500). Set to 0 to allocate randomly.]), + [AC_DEFINE_UNQUOTED(CHARON_UDP_PORT, [$withval], [UDP port used by charon locally]) + AC_SUBST(charon_udp_port, [$withval])], + [AC_SUBST(charon_udp_port, 500)] +) + +AC_ARG_WITH( + [charon-natt-port], + AS_HELP_STRING([--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.]), + [AC_DEFINE_UNQUOTED(CHARON_NATT_PORT, [$withval], [UDP post used by charon locally in case a NAT is detected]) + AC_SUBST(charon_natt_port, [$withval])], + [AC_SUBST(charon_natt_port, 4500)] +) + +AC_MSG_CHECKING([configured UDP ports ($charon_udp_port, $charon_natt_port)]) +if test x$charon_udp_port != x0 -a x$charon_udp_port = x$charon_natt_port; then + AC_MSG_ERROR(the ports have to be different) +else + AC_MSG_RESULT(ok) +fi + +# convert script name to uppercase +AC_SUBST(ipsec_script_upper, [`echo -n "$ipsec_script" | tr a-z A-Z`]) + m4_include(m4/macros/enable-disable.m4) ARG_ENABL_SET([curl], [enable CURL fetcher plugin to fetch files via libcurl. Requires libcurl.]) @@ -87,6 +112,7 @@ ARG_DISBL_SET([sha2], [disable SHA256/SHA384/SHA512 software implement ARG_DISBL_SET([fips-prf], [disable FIPS PRF software implementation plugin.]) ARG_DISBL_SET([gmp], [disable GNU MP (libgmp) based crypto implementation plugin.]) ARG_DISBL_SET([random], [disable RNG implementation on top of /dev/(u)random.]) +ARG_DISBL_SET([nonce], [disable nonce generation plugin.]) ARG_DISBL_SET([x509], [disable X509 certificate implementation plugin.]) ARG_DISBL_SET([revocation], [disable X509 CRL/OCSP revocation check plugin.]) ARG_DISBL_SET([constraints], [disable advanced X509 constraint checking plugin.]) @@ -103,13 +129,11 @@ ARG_ENABL_SET([af-alg], [enable AF_ALG crypto interface to Linux Crypto ARG_ENABL_SET([test-vectors], [enable plugin providing crypto test vectors.]) ARG_ENABL_SET([mysql], [enable MySQL database support. Requires libmysqlclient_r.]) ARG_ENABL_SET([sqlite], [enable SQLite database support. Requires libsqlite3.]) -ARG_DISBL_SET([stroke], [disable charons stroke (pluto compatibility) configuration backend.]) +ARG_DISBL_SET([stroke], [disable charons stroke configuration backend.]) ARG_ENABL_SET([medsrv], [enable mediation server web frontend and daemon plugin.]) ARG_ENABL_SET([medcli], [enable mediation client configuration database plugin.]) ARG_ENABL_SET([smp], [enable SMP configuration and control interface. Requires libxml.]) ARG_ENABL_SET([sql], [enable SQL database configuration backend.]) -ARG_ENABL_SET([smartcard], [enable smartcard support.]) -ARG_ENABL_SET([cisco-quirks], [enable support of Cisco VPN client.]) ARG_ENABL_SET([leak-detective], [enable malloc hooks to find memory leaks.]) ARG_ENABL_SET([lock-profiler], [enable lock/mutex profiling code.]) ARG_ENABL_SET([unit-tester], [enable unit tests on IKEv2 daemon startup.]) @@ -124,13 +148,17 @@ ARG_ENABL_SET([eap-simaka-pseudonym], [enable EAP-SIM/AKA pseudonym storage plug ARG_ENABL_SET([eap-simaka-reauth], [enable EAP-SIM/AKA reauthentication data storage plugin.]) ARG_ENABL_SET([eap-identity], [enable EAP module providing EAP-Identity helper.]) ARG_ENABL_SET([eap-md5], [enable EAP MD5 (CHAP) authentication module.]) -ARG_ENABL_SET([eap-gtc], [enable PAM based EAP GTC authentication module.]) +ARG_ENABL_SET([eap-gtc], [enable EAP GTC authentication module.]) ARG_ENABL_SET([eap-mschapv2], [enable EAP MS-CHAPv2 authentication module.]) ARG_ENABL_SET([eap-tls], [enable EAP TLS authentication module.]) ARG_ENABL_SET([eap-ttls], [enable EAP TTLS authentication module.]) ARG_ENABL_SET([eap-peap], [enable EAP PEAP authentication module.]) ARG_ENABL_SET([eap-tnc], [enable EAP TNC trusted network connect module.]) +ARG_ENABL_SET([eap-dynamic], [enable dynamic EAP proxy module.]) ARG_ENABL_SET([eap-radius], [enable RADIUS proxy authentication module.]) +ARG_DISBL_SET([xauth-generic], [disable generic XAuth backend.]) +ARG_ENABL_SET([xauth-eap], [enable XAuth backend using EAP methods to verify passwords.]) +ARG_ENABL_SET([xauth-pam], [enable XAuth backend using PAM to verify passwords.]) ARG_ENABL_SET([tnc-ifmap], [enable TNC IF-MAP module.]) ARG_ENABL_SET([tnc-pdp], [enable TNC policy decision point module.]) ARG_ENABL_SET([tnc-imc], [enable TNC IMC module.]) @@ -148,24 +176,19 @@ ARG_DISBL_SET([kernel-netlink], [disable the netlink kernel interface.]) ARG_ENABL_SET([kernel-pfkey], [enable the PF_KEY kernel interface.]) ARG_ENABL_SET([kernel-pfroute], [enable the PF_ROUTE kernel interface.]) ARG_ENABL_SET([kernel-klips], [enable the KLIPS kernel interface.]) +ARG_ENABL_SET([libipsec], [enable user space IPsec implementation.]) ARG_DISBL_SET([socket-default], [disable default socket implementation for charon.]) -ARG_ENABL_SET([socket-raw], [enable raw socket implementation of charon, enforced if pluto is enabled]) ARG_ENABL_SET([socket-dynamic], [enable dynamic socket implementation for charon]) ARG_ENABL_SET([farp], [enable ARP faking plugin that responds to ARP requests to peers virtual IP]) -ARG_ENABL_SET([nat-transport], [enable NAT traversal with IPsec transport mode in pluto.]) -ARG_DISBL_SET([vendor-id], [disable the sending of the strongSwan vendor ID in pluto.]) -ARG_DISBL_SET([xauth-vid], [disable the sending of the XAUTH vendor ID.]) ARG_ENABL_SET([dumm], [enable the DUMM UML test framework.]) ARG_ENABL_SET([fast], [enable libfast (FastCGI Application Server w/ templates.]) ARG_ENABL_SET([manager], [enable web management console (proof of concept).]) ARG_ENABL_SET([mediation], [enable IKEv2 Mediation Extension.]) ARG_ENABL_SET([integrity-test], [enable integrity testing of libstrongswan and plugins.]) -ARG_DISBL_SET([load-warning], [disable the charon/pluto plugin load option warning in starter.]) -ARG_DISBL_SET([pluto], [disable the IKEv1 keying daemon pluto.]) -ARG_DISBL_SET([xauth], [disable xauth plugin.]) -ARG_DISBL_SET([threads], [disable the use of threads in pluto. Charon always uses threads.]) -ARG_DISBL_SET([adns], [disable the use of adns in pluto (disables opportunistic encryption).]) -ARG_DISBL_SET([charon], [disable the IKEv2 keying daemon charon.]) +ARG_DISBL_SET([load-warning], [disable the charon plugin load option warning in starter.]) +ARG_DISBL_SET([ikev1], [disable IKEv1 protocol support in charon.]) +ARG_DISBL_SET([ikev2], [disable IKEv2 protocol support in charon.]) +ARG_DISBL_SET([charon], [disable the IKEv1/IKEv2 keying daemon charon.]) ARG_DISBL_SET([tools], [disable additional utilities (openac, scepclient and pki).]) ARG_DISBL_SET([scripts], [disable additional utilities (found in directory scripts).]) ARG_ENABL_SET([conftest], [enforce Suite B conformance test framework.]) @@ -183,10 +206,12 @@ ARG_ENABL_SET([ctr], [enables the Counter Mode wrapper crypto plugin. ARG_ENABL_SET([ccm], [enables the CCM AEAD wrapper crypto plugin.]) ARG_ENABL_SET([gcm], [enables the GCM AEAD wrapper crypto plugin.]) ARG_ENABL_SET([addrblock], [enables RFC 3779 address block constraint support.]) +ARG_ENABL_SET([unity], [enables Cisco Unity extension plugin.]) ARG_ENABL_SET([uci], [enable OpenWRT UCI configuration plugin.]) ARG_ENABL_SET([android], [enable Android specific plugin.]) +ARG_ENABL_SET([android-log], [enable Android specific logger plugin.]) ARG_ENABL_SET([maemo], [enable Maemo specific plugin.]) -ARG_ENABL_SET([nm], [enable NetworkManager plugin.]) +ARG_ENABL_SET([nm], [enable NetworkManager backend.]) ARG_ENABL_SET([ha], [enable high availability cluster plugin.]) ARG_ENABL_SET([whitelist], [enable peer identity whitelisting plugin.]) ARG_ENABL_SET([certexpire], [enable CSV export of expiration dates of used certificates.]) @@ -196,6 +221,7 @@ ARG_ENABL_SET([coupling], [enable IKEv2 plugin to couple peer certificates ARG_ENABL_SET([radattr], [enable plugin to inject and process custom RADIUS attributes as IKEv2 client.]) ARG_ENABL_SET([vstr], [enforce using the Vstr string library to replace glibc-like printf hooks.]) ARG_ENABL_SET([monolithic], [build monolithic version of libstrongswan that includes all enabled plugins. Similarly, the plugins of charon are assembled in libcharon.]) +ARG_ENABL_SET([bfd-backtraces], [use binutils libbfd to resolve backtraces for memory leaks and segfaults.]) dnl ========================= dnl set up compiler and flags @@ -237,6 +263,10 @@ dnl ========================= dnl dependency calculation dnl ========================= +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 @@ -298,22 +328,13 @@ if test x$medcli = xtrue; then mediation=true fi -if test x$pluto = xtrue; then - if test x$socket_raw = xfalse; then - AC_MSG_NOTICE([Enforcing --enable-socket-raw, as pluto is enabled]) - socket_raw=true - if test x$socket_default_given = xfalse; then - socket_default=false - fi - fi -fi - dnl =========================================== dnl check required libraries and header files dnl =========================================== AC_HEADER_STDBOOL AC_FUNC_ALLOCA +AC_FUNC_STRERROR_R dnl libraries needed on some platforms but not on others dnl ==================================================== @@ -357,7 +378,7 @@ AC_TRY_COMPILE( #include <dlfcn.h>], [Dl_info* info = 0; dladdr(0, info);], - [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_DLADDR])], + [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_DLADDR], [], [have dladdr()])], [AC_MSG_RESULT([no])] ) @@ -370,12 +391,15 @@ AC_TRY_RUN( int main() { pthread_condattr_t attr; pthread_condattr_init(&attr); return pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);}], - [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_CONDATTR_CLOCK_MONOTONIC])], + [AC_MSG_RESULT([yes]); + AC_DEFINE([HAVE_CONDATTR_CLOCK_MONOTONIC], [], + [pthread_condattr_setclock supports CLOCK_MONOTONIC])], [AC_MSG_RESULT([no])], dnl Check existence of pthread_condattr_setclock if cross-compiling [AC_MSG_RESULT([unknown]); AC_CHECK_FUNCS(pthread_condattr_setclock, - [AC_DEFINE([HAVE_CONDATTR_CLOCK_MONOTONIC])] + [AC_DEFINE([HAVE_CONDATTR_CLOCK_MONOTONIC], [], + [have pthread_condattr_setclock()])] )] ) dnl check if we actually are able to configure attributes on cond vars @@ -386,11 +410,13 @@ dnl check if we can cancel threads AC_CHECK_FUNCS(pthread_cancel) dnl check if native rwlocks are available AC_CHECK_FUNCS(pthread_rwlock_init) +dnl check if we have POSIX semaphore functions, including timed-wait +AC_CHECK_FUNCS(sem_timedwait) LIBS=$saved_LIBS AC_CHECK_FUNC( [gettid], - [AC_DEFINE(HAVE_GETTID)], + [AC_DEFINE([HAVE_GETTID], [], [have gettid()])], [AC_MSG_CHECKING([for SYS_gettid]) AC_TRY_COMPILE( [#define _GNU_SOURCE @@ -398,16 +424,18 @@ AC_CHECK_FUNC( #include <sys/syscall.h>], [int main() { return syscall(SYS_gettid);}], - [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_GETTID]) - AC_DEFINE([HAVE_SYS_GETTID])], + [AC_MSG_RESULT([yes]); + AC_DEFINE([HAVE_GETTID], [], [have gettid()]) + AC_DEFINE([HAVE_SYS_GETTID], [], [have syscall(SYS_gettid)])], [AC_MSG_RESULT([no])] )] ) -AC_CHECK_FUNCS(prctl mallinfo getpass closefrom) +AC_CHECK_FUNCS(prctl mallinfo getpass closefrom getpwnam_r getgrnam_r) AC_CHECK_HEADERS(sys/sockio.h glob.h) AC_CHECK_HEADERS(net/pfkeyv2.h netipsec/ipsec.h netinet6/ipsec.h linux/udp.h) +AC_CHECK_HEADERS(netinet/ip6.h) AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [ @@ -433,7 +461,8 @@ AC_TRY_COMPILE( #include <netinet/in.h>], [struct in6_addr in6; in6 = in6addr_any;], - [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_IN6ADDR_ANY])], + [AC_MSG_RESULT([yes]); + AC_DEFINE([HAVE_IN6ADDR_ANY], [], [have struct in6_addr in6addr_any])], [AC_MSG_RESULT([no])] ) @@ -448,7 +477,8 @@ AC_TRY_COMPILE( { return 0; }], - [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_IN6_PKTINFO])], + [AC_MSG_RESULT([yes]); + AC_DEFINE([HAVE_IN6_PKTINFO], [], [have struct in6_pktinfo.ipi6_ifindex])], [AC_MSG_RESULT([no])] ) @@ -465,7 +495,8 @@ AC_TRY_COMPILE( #endif], [int mode = IPSEC_MODE_BEET; return mode;], - [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_IPSEC_MODE_BEET])], + [AC_MSG_RESULT([yes]); + AC_DEFINE([HAVE_IPSEC_MODE_BEET], [], [have IPSEC_MODE_BEET defined])], [AC_MSG_RESULT([no])] ) @@ -482,7 +513,8 @@ AC_TRY_COMPILE( #endif], [int dir = IPSEC_DIR_FWD; return dir;], - [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_IPSEC_DIR_FWD])], + [AC_MSG_RESULT([yes]); + AC_DEFINE([HAVE_IPSEC_DIR_FWD], [], [have IPSEC_DIR_FWD defined])], [AC_MSG_RESULT([no])] ) @@ -493,7 +525,8 @@ AC_TRY_COMPILE( #include <linux/rtnetlink.h>], [int rta_type = RTA_TABLE; return rta_type;], - [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_RTA_TABLE])], + [AC_MSG_RESULT([yes]); + AC_DEFINE([HAVE_RTA_TABLE], [], [have netlink RTA_TABLE defined])], [AC_MSG_RESULT([no])] ) @@ -509,7 +542,9 @@ AC_TRY_RUN( return ref; } ], -[AC_MSG_RESULT([yes]); AC_DEFINE(HAVE_GCC_ATOMIC_OPERATIONS)], +[AC_MSG_RESULT([yes]); + AC_DEFINE([HAVE_GCC_ATOMIC_OPERATIONS], [], + [have GCC __sync_* atomic operations])], [AC_MSG_RESULT([no])], [AC_MSG_RESULT([no])]) @@ -517,10 +552,10 @@ dnl check for the new register_printf_specifier function with len argument, dnl or the deprecated register_printf_function without AC_CHECK_FUNC( [register_printf_specifier], - [AC_DEFINE(HAVE_PRINTF_SPECIFIER)], + [AC_DEFINE([HAVE_PRINTF_SPECIFIER], [], [have register_printf_specifier()])], [AC_CHECK_FUNC( [register_printf_function], - [AC_DEFINE(HAVE_PRINTF_FUNCTION)], + [AC_DEFINE([HAVE_PRINTF_FUNCTION], [], [have register_printf_function()])], [ AC_MSG_NOTICE([printf does not support custom format specifiers!]) vstr=true @@ -530,7 +565,7 @@ AC_CHECK_FUNC( if test x$vstr = xtrue; then AC_HAVE_LIBRARY([vstr],[LIBS="$LIBS"],[AC_MSG_ERROR([Vstr string library not found])]) - AC_DEFINE(USE_VSTR) + AC_DEFINE([USE_VSTR], [], [use vstring library for printf hooks]) fi if test x$gmp = xtrue; then @@ -543,7 +578,9 @@ if test x$gmp = xtrue; then [ void *x = mpz_powm_sec; ], - [AC_MSG_RESULT([yes]); AC_DEFINE(HAVE_MPZ_POWM_SEC)], [AC_MSG_RESULT([no])] + [AC_MSG_RESULT([yes]); + AC_DEFINE([HAVE_MPZ_POWM_SEC], [], [have mpz_mown_sec()])], + [AC_MSG_RESULT([no])] ) else AC_MSG_RESULT([disabled]) @@ -669,7 +706,9 @@ if test x$sqlite = xtrue; then [ void *test = sqlite3_prepare_v2; ], - [AC_MSG_RESULT([yes])]; AC_DEFINE_UNQUOTED(HAVE_SQLITE3_PREPARE_V2, 1), [AC_MSG_RESULT([no])]) + [AC_MSG_RESULT([yes])]; + AC_DEFINE([HAVE_SQLITE3_PREPARE_V2], [], [have sqlite3_prepare_v2()]), + [AC_MSG_RESULT([no])]) AC_MSG_CHECKING([sqlite3.h version >= 3.3.1]) AC_TRY_COMPILE( [#include <sqlite3.h>], @@ -693,7 +732,8 @@ if test x$gcrypt = xtrue; then AC_TRY_COMPILE( [#include <gcrypt.h>], [enum gcry_cipher_algos alg = GCRY_CIPHER_CAMELLIA128;], - [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_GCRY_CIPHER_CAMELLIA])], + [AC_MSG_RESULT([yes]); + AC_DEFINE([HAVE_GCRY_CIPHER_CAMELLIA], [], [have GCRY_CIPHER_CAMELLIA128])], [AC_MSG_RESULT([no])] ) fi @@ -728,14 +768,14 @@ fi if test x$nm = xtrue; then PKG_CHECK_EXISTS([libnm-glib], - [PKG_CHECK_MODULES(nm, [NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn])], - [PKG_CHECK_MODULES(nm, [NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn])] + [PKG_CHECK_MODULES(nm, [NetworkManager gthread-2.0 libnm-util libnm-glib libnm-glib-vpn])], + [PKG_CHECK_MODULES(nm, [NetworkManager gthread-2.0 libnm_util libnm_glib libnm_glib_vpn])] ) AC_SUBST(nm_CFLAGS) AC_SUBST(nm_LIBS) fi -if test x$eap_gtc = xtrue; then +if test x$xauth_pam = xtrue; then AC_HAVE_LIBRARY([pam],[LIBS="$LIBS"],[AC_MSG_ERROR([PAM library not found])]) AC_CHECK_HEADER([security/pam_appl.h],,[AC_MSG_ERROR([PAM header security/pam_appl.h not found!])]) fi @@ -746,15 +786,15 @@ if test x$capabilities = xnative; then dnl but defines capset() in unistd.h instead. AC_CHECK_HEADERS([sys/capability.h]) AC_CHECK_FUNC(capset,,[AC_MSG_ERROR([capset() not found!])]) - AC_DEFINE(CAPABILITIES_NATIVE) + AC_DEFINE([CAPABILITIES_NATIVE], [], [have native linux capset()]) fi if test x$capabilities = xlibcap; then AC_HAVE_LIBRARY([cap],[LIBS="$LIBS"],[AC_MSG_ERROR([libcap library not found])]) AC_CHECK_HEADER([sys/capability.h], - [AC_DEFINE(HAVE_SYS_CAPABILITY_H)], + [AC_DEFINE([HAVE_SYS_CAPABILITY_H], [], [have sys/capability.h])], [AC_MSG_ERROR([libcap header sys/capability.h not found!])]) - AC_DEFINE(CAPABILITIES_LIBCAP) + AC_DEFINE([CAPABILITIES_LIBCAP], [], [have libpcap library]) fi if test x$integrity_test = xtrue; then @@ -776,6 +816,22 @@ if test x$integrity_test = xtrue; then ) fi +if test x$bfd_backtraces = xtrue; then + AC_HAVE_LIBRARY([bfd],[LIBS="$LIBS"],[AC_MSG_ERROR([binutils libbfd not found!])]) + AC_CHECK_HEADER([bfd.h],[AC_DEFINE([HAVE_BFD_H],,[have binutils bfd.h])], + [AC_MSG_ERROR([binutils bfd.h header not found!])]) + BFDLIB="-lbfd" + AC_SUBST(BFDLIB) +fi + +AM_CONDITIONAL(USE_DEV_HEADERS, [test "x$dev_headers" != xno]) +if test x$dev_headers = xyes; then + dev_headers="$includedir/strongswan" +fi +AC_SUBST(dev_headers) + +CFLAGS="$CFLAGS -include `pwd`/config.h" + dnl ============================================== dnl collect plugin list for strongSwan components dnl ============================================== @@ -783,8 +839,7 @@ dnl ============================================== m4_include(m4/macros/add-plugin.m4) # plugin lists for all components -libcharon_plugins= -pluto_plugins= +charon_plugins= starter_plugins= pool_plugins= attest_plugins= @@ -794,112 +849,115 @@ 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= -ADD_PLUGIN([test-vectors], [s libcharon pluto openac scepclient pki]) -ADD_PLUGIN([curl], [s libcharon pluto scepclient scripts]) -ADD_PLUGIN([soup], [s libcharon pluto scripts]) -ADD_PLUGIN([ldap], [s libcharon pluto scepclient scripts]) -ADD_PLUGIN([mysql], [s libcharon pluto pool manager medsrv attest]) -ADD_PLUGIN([sqlite], [s libcharon pluto pool manager medsrv attest]) -ADD_PLUGIN([pkcs11], [s libcharon pki]) -ADD_PLUGIN([aes], [s libcharon pluto openac scepclient pki scripts]) -ADD_PLUGIN([des], [s libcharon pluto openac scepclient pki scripts]) -ADD_PLUGIN([blowfish], [s libcharon pluto openac scepclient pki scripts]) -ADD_PLUGIN([sha1], [s libcharon pluto openac scepclient pki scripts medsrv attest]) -ADD_PLUGIN([sha2], [s libcharon pluto openac scepclient pki scripts medsrv attest]) -ADD_PLUGIN([md4], [s libcharon openac manager scepclient pki]) -ADD_PLUGIN([md5], [s libcharon pluto openac scepclient pki scripts attest]) -ADD_PLUGIN([random], [s libcharon pluto openac scepclient pki scripts medsrv attest]) -ADD_PLUGIN([x509], [s libcharon pluto openac scepclient pki scripts attest]) -ADD_PLUGIN([revocation], [s libcharon]) -ADD_PLUGIN([constraints], [s libcharon]) -ADD_PLUGIN([pubkey], [s libcharon]) -ADD_PLUGIN([pkcs1], [s libcharon pluto openac scepclient pki scripts manager medsrv attest]) -ADD_PLUGIN([pkcs8], [s libcharon pluto openac scepclient pki scripts manager medsrv attest]) -ADD_PLUGIN([pgp], [s libcharon pluto]) -ADD_PLUGIN([dnskey], [s pluto]) -ADD_PLUGIN([pem], [s libcharon pluto openac scepclient pki scripts manager medsrv attest]) -ADD_PLUGIN([padlock], [s libcharon]) -ADD_PLUGIN([openssl], [s libcharon pluto openac scepclient pki scripts manager medsrv attest]) -ADD_PLUGIN([gcrypt], [s libcharon pluto openac scepclient pki scripts manager medsrv attest]) -ADD_PLUGIN([af-alg], [s libcharon pluto openac scepclient pki scripts medsrv attest]) -ADD_PLUGIN([fips-prf], [s libcharon]) -ADD_PLUGIN([gmp], [s libcharon pluto openac scepclient pki scripts manager medsrv attest]) -ADD_PLUGIN([agent], [s libcharon]) -ADD_PLUGIN([xcbc], [s libcharon]) -ADD_PLUGIN([cmac], [s libcharon]) -ADD_PLUGIN([hmac], [s libcharon pluto scripts]) -ADD_PLUGIN([ctr], [s libcharon scripts]) -ADD_PLUGIN([ccm], [s libcharon scripts]) -ADD_PLUGIN([gcm], [s libcharon scripts]) -ADD_PLUGIN([xauth], [p pluto]) -ADD_PLUGIN([attr], [h libcharon pluto]) -ADD_PLUGIN([attr-sql], [h libcharon pluto]) -ADD_PLUGIN([load-tester], [c libcharon]) -ADD_PLUGIN([kernel-pfkey], [h libcharon pluto starter]) -ADD_PLUGIN([kernel-pfroute], [h libcharon pluto starter]) -ADD_PLUGIN([kernel-klips], [h libcharon pluto starter]) -ADD_PLUGIN([kernel-netlink], [h libcharon pluto starter]) -ADD_PLUGIN([resolve], [h libcharon pluto]) -ADD_PLUGIN([socket-default], [c libcharon]) -ADD_PLUGIN([socket-raw], [c libcharon]) -ADD_PLUGIN([socket-dynamic], [c libcharon]) -ADD_PLUGIN([farp], [c libcharon]) -ADD_PLUGIN([stroke], [c libcharon]) -ADD_PLUGIN([smp], [c libcharon]) -ADD_PLUGIN([sql], [c libcharon]) -ADD_PLUGIN([updown], [c libcharon]) -ADD_PLUGIN([eap-identity], [c libcharon]) -ADD_PLUGIN([eap-sim], [c libcharon]) -ADD_PLUGIN([eap-sim-file], [c libcharon]) -ADD_PLUGIN([eap-sim-pcsc], [c libcharon]) -ADD_PLUGIN([eap-aka], [c libcharon]) -ADD_PLUGIN([eap-aka-3gpp2], [c libcharon]) -ADD_PLUGIN([eap-simaka-sql], [c libcharon]) -ADD_PLUGIN([eap-simaka-pseudonym], [c libcharon]) -ADD_PLUGIN([eap-simaka-reauth], [c libcharon]) -ADD_PLUGIN([eap-md5], [c libcharon]) -ADD_PLUGIN([eap-gtc], [c libcharon]) -ADD_PLUGIN([eap-mschapv2], [c libcharon]) -ADD_PLUGIN([eap-radius], [c libcharon]) -ADD_PLUGIN([eap-tls], [c libcharon]) -ADD_PLUGIN([eap-ttls], [c libcharon]) -ADD_PLUGIN([eap-peap], [c libcharon]) -ADD_PLUGIN([eap-tnc], [c libcharon]) -ADD_PLUGIN([tnc-ifmap], [c libcharon]) -ADD_PLUGIN([tnc-pdp], [c libcharon]) -ADD_PLUGIN([tnc-imc], [c libcharon]) -ADD_PLUGIN([tnc-imv], [c libcharon]) -ADD_PLUGIN([tnc-tnccs], [c libcharon]) -ADD_PLUGIN([tnccs-20], [c libcharon]) -ADD_PLUGIN([tnccs-11], [c libcharon]) -ADD_PLUGIN([tnccs-dynamic], [c libcharon]) -ADD_PLUGIN([medsrv], [c libcharon]) -ADD_PLUGIN([medcli], [c libcharon]) -ADD_PLUGIN([nm], [c libcharon]) -ADD_PLUGIN([dhcp], [c libcharon]) -ADD_PLUGIN([android], [c libcharon]) -ADD_PLUGIN([ha], [c libcharon]) -ADD_PLUGIN([whitelist], [c libcharon]) -ADD_PLUGIN([certexpire], [c libcharon]) -ADD_PLUGIN([led], [c libcharon]) -ADD_PLUGIN([duplicheck], [c libcharon]) -ADD_PLUGIN([coupling], [c libcharon]) -ADD_PLUGIN([radattr], [c libcharon]) -ADD_PLUGIN([maemo], [c libcharon]) -ADD_PLUGIN([uci], [c libcharon]) -ADD_PLUGIN([addrblock], [c libcharon]) -ADD_PLUGIN([unit-tester], [c libcharon]) - -AC_SUBST(libcharon_plugins) -AC_SUBST(pluto_plugins) +ADD_PLUGIN([test-vectors], [s charon openac scepclient pki]) +ADD_PLUGIN([curl], [s charon scepclient scripts nm]) +ADD_PLUGIN([soup], [s charon scripts nm]) +ADD_PLUGIN([ldap], [s charon scepclient scripts nm]) +ADD_PLUGIN([mysql], [s charon pool manager medsrv attest]) +ADD_PLUGIN([sqlite], [s charon pool manager medsrv attest]) +ADD_PLUGIN([pkcs11], [s charon pki nm]) +ADD_PLUGIN([aes], [s charon openac scepclient pki scripts nm]) +ADD_PLUGIN([des], [s charon openac scepclient pki scripts nm]) +ADD_PLUGIN([blowfish], [s charon openac scepclient pki scripts nm]) +ADD_PLUGIN([sha1], [s charon openac scepclient pki scripts medsrv attest nm]) +ADD_PLUGIN([sha2], [s charon openac scepclient pki scripts medsrv attest nm]) +ADD_PLUGIN([md4], [s charon openac manager scepclient pki nm]) +ADD_PLUGIN([md5], [s charon openac scepclient pki scripts attest nm]) +ADD_PLUGIN([random], [s charon openac scepclient pki scripts medsrv attest nm]) +ADD_PLUGIN([nonce], [s charon nm]) +ADD_PLUGIN([x509], [s charon openac scepclient pki scripts attest nm]) +ADD_PLUGIN([revocation], [s charon nm]) +ADD_PLUGIN([constraints], [s charon nm]) +ADD_PLUGIN([pubkey], [s charon]) +ADD_PLUGIN([pkcs1], [s charon openac scepclient pki scripts manager medsrv attest nm]) +ADD_PLUGIN([pkcs8], [s charon openac scepclient pki scripts manager medsrv attest nm]) +ADD_PLUGIN([pgp], [s charon]) +ADD_PLUGIN([dnskey], [s charon]) +ADD_PLUGIN([pem], [s charon openac scepclient pki scripts manager medsrv attest nm]) +ADD_PLUGIN([padlock], [s charon]) +ADD_PLUGIN([openssl], [s charon openac scepclient pki scripts manager medsrv attest nm]) +ADD_PLUGIN([gcrypt], [s charon openac scepclient pki scripts manager medsrv attest nm]) +ADD_PLUGIN([af-alg], [s charon openac scepclient pki scripts medsrv attest nm]) +ADD_PLUGIN([fips-prf], [s charon nm]) +ADD_PLUGIN([gmp], [s charon openac scepclient pki scripts manager medsrv attest nm]) +ADD_PLUGIN([agent], [s charon nm]) +ADD_PLUGIN([xcbc], [s charon nm]) +ADD_PLUGIN([cmac], [s charon nm]) +ADD_PLUGIN([hmac], [s charon scripts nm]) +ADD_PLUGIN([ctr], [s charon scripts nm]) +ADD_PLUGIN([ccm], [s charon scripts nm]) +ADD_PLUGIN([gcm], [s charon scripts nm]) +ADD_PLUGIN([attr], [h charon]) +ADD_PLUGIN([attr-sql], [h charon]) +ADD_PLUGIN([load-tester], [c charon]) +ADD_PLUGIN([kernel-pfkey], [h charon starter nm]) +ADD_PLUGIN([kernel-pfroute], [h charon starter nm]) +ADD_PLUGIN([kernel-klips], [h charon starter]) +ADD_PLUGIN([kernel-netlink], [h charon starter nm]) +ADD_PLUGIN([resolve], [h charon]) +ADD_PLUGIN([socket-default], [c charon nm]) +ADD_PLUGIN([socket-dynamic], [c charon]) +ADD_PLUGIN([farp], [c charon]) +ADD_PLUGIN([stroke], [c charon]) +ADD_PLUGIN([smp], [c charon]) +ADD_PLUGIN([sql], [c charon]) +ADD_PLUGIN([updown], [c charon]) +ADD_PLUGIN([eap-identity], [c charon nm]) +ADD_PLUGIN([eap-sim], [c charon]) +ADD_PLUGIN([eap-sim-file], [c charon]) +ADD_PLUGIN([eap-sim-pcsc], [c charon]) +ADD_PLUGIN([eap-aka], [c charon]) +ADD_PLUGIN([eap-aka-3gpp2], [c charon]) +ADD_PLUGIN([eap-simaka-sql], [c charon]) +ADD_PLUGIN([eap-simaka-pseudonym], [c charon]) +ADD_PLUGIN([eap-simaka-reauth], [c charon]) +ADD_PLUGIN([eap-md5], [c charon nm]) +ADD_PLUGIN([eap-gtc], [c charon nm]) +ADD_PLUGIN([eap-mschapv2], [c charon nm]) +ADD_PLUGIN([eap-dynamic], [c charon]) +ADD_PLUGIN([eap-radius], [c charon]) +ADD_PLUGIN([eap-tls], [c charon nm]) +ADD_PLUGIN([eap-ttls], [c charon nm]) +ADD_PLUGIN([eap-peap], [c charon nm]) +ADD_PLUGIN([eap-tnc], [c charon]) +ADD_PLUGIN([xauth-generic], [c charon]) +ADD_PLUGIN([xauth-eap], [c charon]) +ADD_PLUGIN([xauth-pam], [c charon]) +ADD_PLUGIN([tnc-ifmap], [c charon]) +ADD_PLUGIN([tnc-pdp], [c charon]) +ADD_PLUGIN([tnc-imc], [c charon]) +ADD_PLUGIN([tnc-imv], [c charon]) +ADD_PLUGIN([tnc-tnccs], [c charon]) +ADD_PLUGIN([tnccs-20], [c charon]) +ADD_PLUGIN([tnccs-11], [c charon]) +ADD_PLUGIN([tnccs-dynamic], [c charon]) +ADD_PLUGIN([medsrv], [c charon]) +ADD_PLUGIN([medcli], [c charon]) +ADD_PLUGIN([dhcp], [c charon]) +ADD_PLUGIN([android], [c charon]) +ADD_PLUGIN([android-log], [c charon]) +ADD_PLUGIN([ha], [c charon]) +ADD_PLUGIN([whitelist], [c charon]) +ADD_PLUGIN([certexpire], [c charon]) +ADD_PLUGIN([led], [c charon]) +ADD_PLUGIN([duplicheck], [c charon]) +ADD_PLUGIN([coupling], [c charon]) +ADD_PLUGIN([radattr], [c charon]) +ADD_PLUGIN([maemo], [c charon]) +ADD_PLUGIN([uci], [c charon]) +ADD_PLUGIN([addrblock], [c charon]) +ADD_PLUGIN([unity], [c charon]) +ADD_PLUGIN([unit-tester], [c charon]) + +AC_SUBST(charon_plugins) AC_SUBST(starter_plugins) AC_SUBST(pool_plugins) AC_SUBST(attest_plugins) @@ -909,6 +967,7 @@ AC_SUBST(pki_plugins) AC_SUBST(scripts_plugins) AC_SUBST(manager_plugins) AC_SUBST(medsrv_plugins) +AC_SUBST(nm_plugins) AC_SUBST(c_plugins) AC_SUBST(p_plugins) @@ -935,6 +994,7 @@ AM_CONDITIONAL(USE_SHA2, test x$sha2 = xtrue) AM_CONDITIONAL(USE_FIPS_PRF, test x$fips_prf = xtrue) AM_CONDITIONAL(USE_GMP, test x$gmp = xtrue) AM_CONDITIONAL(USE_RANDOM, test x$random = xtrue) +AM_CONDITIONAL(USE_NONCE, test x$nonce = xtrue) AM_CONDITIONAL(USE_X509, test x$x509 = xtrue) AM_CONDITIONAL(USE_REVOCATION, test x$revocation = xtrue) AM_CONDITIONAL(USE_CONSTRAINTS, test x$constraints = xtrue) @@ -964,9 +1024,9 @@ dnl ============== AM_CONDITIONAL(USE_STROKE, test x$stroke = xtrue) AM_CONDITIONAL(USE_MEDSRV, test x$medsrv = xtrue) AM_CONDITIONAL(USE_MEDCLI, test x$medcli = xtrue) -AM_CONDITIONAL(USE_NM, test x$nm = xtrue) AM_CONDITIONAL(USE_UCI, test x$uci = xtrue) AM_CONDITIONAL(USE_ANDROID, test x$android = xtrue) +AM_CONDITIONAL(USE_ANDROID_LOG, test x$android_log = xtrue) AM_CONDITIONAL(USE_MAEMO, test x$maemo = xtrue) AM_CONDITIONAL(USE_SMP, test x$smp = xtrue) AM_CONDITIONAL(USE_SQL, test x$sql = xtrue) @@ -997,7 +1057,11 @@ AM_CONDITIONAL(USE_EAP_TLS, test x$eap_tls = xtrue) AM_CONDITIONAL(USE_EAP_TTLS, test x$eap_ttls = xtrue) AM_CONDITIONAL(USE_EAP_PEAP, test x$eap_peap = xtrue) AM_CONDITIONAL(USE_EAP_TNC, test x$eap_tnc = xtrue) +AM_CONDITIONAL(USE_EAP_DYNAMIC, test x$eap_dynamic = xtrue) AM_CONDITIONAL(USE_EAP_RADIUS, test x$eap_radius = xtrue) +AM_CONDITIONAL(USE_XAUTH_GENERIC, test x$xauth_generic = xtrue) +AM_CONDITIONAL(USE_XAUTH_EAP, test x$xauth_eap = xtrue) +AM_CONDITIONAL(USE_XAUTH_PAM, test x$xauth_pam = xtrue) AM_CONDITIONAL(USE_TNC_IFMAP, test x$tnc_ifmap = xtrue) AM_CONDITIONAL(USE_TNC_PDP, test x$tnc_pdp = xtrue) AM_CONDITIONAL(USE_TNC_IMC, test x$tnc_imc = xtrue) @@ -1013,10 +1077,10 @@ AM_CONDITIONAL(USE_IMV_SCANNER, test x$imv_scanner = xtrue) AM_CONDITIONAL(USE_IMC_ATTESTATION, test x$imc_attestation = xtrue) AM_CONDITIONAL(USE_IMV_ATTESTATION, test x$imv_attestation = xtrue) AM_CONDITIONAL(USE_SOCKET_DEFAULT, test x$socket_default = xtrue) -AM_CONDITIONAL(USE_SOCKET_RAW, test x$socket_raw = xtrue) AM_CONDITIONAL(USE_SOCKET_DYNAMIC, test x$socket_dynamic = xtrue) AM_CONDITIONAL(USE_FARP, test x$farp = xtrue) AM_CONDITIONAL(USE_ADDRBLOCK, test x$addrblock = xtrue) +AM_CONDITIONAL(USE_UNITY, test x$unity = xtrue) dnl hydra plugins dnl ============= @@ -1028,39 +1092,33 @@ AM_CONDITIONAL(USE_KERNEL_PFKEY, test x$kernel_pfkey = xtrue) AM_CONDITIONAL(USE_KERNEL_PFROUTE, test x$kernel_pfroute = xtrue) AM_CONDITIONAL(USE_RESOLVE, test x$resolve = xtrue) -dnl pluto plugins -dnl ============= -AM_CONDITIONAL(USE_XAUTH, test x$xauth = xtrue) - dnl other options dnl ============= -AM_CONDITIONAL(USE_SMARTCARD, test x$smartcard = xtrue) -AM_CONDITIONAL(USE_CISCO_QUIRKS, test x$cisco_quirks = xtrue) AM_CONDITIONAL(USE_LEAK_DETECTIVE, test x$leak_detective = xtrue) AM_CONDITIONAL(USE_LOCK_PROFILER, test x$lock_profiler = xtrue) -AM_CONDITIONAL(USE_NAT_TRANSPORT, test x$nat_transport = xtrue) -AM_CONDITIONAL(USE_VENDORID, test x$vendor_id = xtrue) -AM_CONDITIONAL(USE_XAUTH_VID, test x$xauth_vid = xtrue) AM_CONDITIONAL(USE_DUMM, test x$dumm = xtrue) AM_CONDITIONAL(USE_FAST, test x$fast = xtrue) AM_CONDITIONAL(USE_MANAGER, test x$manager = xtrue) AM_CONDITIONAL(USE_ME, test x$mediation = xtrue) AM_CONDITIONAL(USE_INTEGRITY_TEST, test x$integrity_test = xtrue) AM_CONDITIONAL(USE_LOAD_WARNING, test x$load_warning = xtrue) -AM_CONDITIONAL(USE_PLUTO, test x$pluto = xtrue) +AM_CONDITIONAL(USE_IKEV1, test x$ikev1 = xtrue) +AM_CONDITIONAL(USE_IKEV2, test x$ikev2 = xtrue) AM_CONDITIONAL(USE_THREADS, test x$threads = xtrue) AM_CONDITIONAL(USE_ADNS, test x$adns = xtrue) AM_CONDITIONAL(USE_CHARON, test x$charon = xtrue) +AM_CONDITIONAL(USE_NM, test x$nm = xtrue) AM_CONDITIONAL(USE_TOOLS, test x$tools = xtrue) AM_CONDITIONAL(USE_SCRIPTS, test x$scripts = xtrue) AM_CONDITIONAL(USE_CONFTEST, test x$conftest = xtrue) -AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$pluto = xtrue -o x$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue) -AM_CONDITIONAL(USE_LIBHYDRA, test x$charon = xtrue -o x$pluto = xtrue) -AM_CONDITIONAL(USE_LIBCHARON, test x$charon = xtrue -o x$conftest = xtrue) +AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue -o x$nm = xtrue) +AM_CONDITIONAL(USE_LIBHYDRA, test x$charon = xtrue -o x$nm = xtrue) +AM_CONDITIONAL(USE_LIBCHARON, test x$charon = xtrue -o x$conftest = xtrue -o x$nm = xtrue) +AM_CONDITIONAL(USE_LIBIPSEC, test x$libipsec = xtrue) AM_CONDITIONAL(USE_LIBTNCIF, test x$tnc_tnccs = xtrue -o x$imcv = xtrue) AM_CONDITIONAL(USE_LIBTNCCS, test x$tnc_tnccs = xtrue) -AM_CONDITIONAL(USE_FILE_CONFIG, test x$pluto = xtrue -o x$stroke = xtrue) -AM_CONDITIONAL(USE_IPSEC_SCRIPT, test x$pluto = xtrue -o x$stroke = xtrue -o x$tools = xtrue -o x$conftest = xtrue) +AM_CONDITIONAL(USE_FILE_CONFIG, test x$stroke = xtrue) +AM_CONDITIONAL(USE_IPSEC_SCRIPT, test x$stroke = xtrue -o x$tools = xtrue -o x$conftest = xtrue) AM_CONDITIONAL(USE_LIBCAP, test x$capabilities = xlibcap) AM_CONDITIONAL(USE_VSTR, test x$vstr = xtrue) AM_CONDITIONAL(USE_SIMAKA, test x$simaka = xtrue) @@ -1075,15 +1133,20 @@ dnl set global definitions dnl ============================== if test x$mediation = xtrue; then - AC_DEFINE(ME) + AC_DEFINE([ME], [], [mediation extension support]) fi if test x$capabilities = xlibcap -o x$capabilities = xnative; then - AC_DEFINE(CAPABILITIES) + AC_DEFINE([CAPABILITIES], [], [capability dropping support]) fi if test x$monolithic = xtrue; then - AC_DEFINE(MONOLITHIC) + AC_DEFINE([MONOLITHIC], [], [monolithic build embedding plugins]) +fi +if test x$ikev1 = xtrue; then + AC_DEFINE([USE_IKEV1], [], [support for IKEv1 protocol]) +fi +if test x$ikev2 = xtrue; then + AC_DEFINE([USE_IKEV2], [], [support for IKEv2 protocol]) fi - dnl ============================== dnl build Makefiles @@ -1108,6 +1171,7 @@ AC_OUTPUT( 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 @@ -1142,7 +1206,7 @@ AC_OUTPUT( src/libhydra/plugins/kernel_pfkey/Makefile src/libhydra/plugins/kernel_pfroute/Makefile src/libhydra/plugins/resolve/Makefile - src/libfreeswan/Makefile + src/libipsec/Makefile src/libsimaka/Makefile src/libtls/Makefile src/libradius/Makefile @@ -1156,13 +1220,12 @@ AC_OUTPUT( 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/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 @@ -1178,6 +1241,9 @@ AC_OUTPUT( 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 @@ -1187,15 +1253,14 @@ AC_OUTPUT( 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/unity/Makefile src/libcharon/plugins/uci/Makefile src/libcharon/plugins/ha/Makefile src/libcharon/plugins/whitelist/Makefile @@ -1205,6 +1270,7 @@ AC_OUTPUT( 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 |