diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2009-04-30 17:13:45 +0000 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2009-04-30 17:13:45 +0000 |
| commit | ea7e89c72c986826b7717a708bd47cb9f37de3a0 (patch) | |
| tree | 4aa8e025ce00f4cd4d919a7524528e497ec5b55d | |
| parent | 8c5d72cd0be83ca92dc62a526eb05ecb140f3532 (diff) | |
| download | strongswan-ea7e89c72c986826b7717a708bd47cb9f37de3a0.tar.bz2 strongswan-ea7e89c72c986826b7717a708bd47cb9f37de3a0.tar.xz | |
somehow missed these changes during the portability branch back-merge
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 37 | ||||
| -rw-r--r-- | testing/Makefile.am | 2 |
3 files changed, 38 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index e6a73e996..95eb8d95e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ Doxyfile : Doxyfile.in sed \ -e "s:\@PACKAGE_VERSION\@:$(PACKAGE_VERSION):" \ -e "s:\@PACKAGE_NAME\@:$(PACKAGE_NAME):" \ - $< > $@ + $(srcdir)/$@.in > $@ apidoc : Doxyfile doxygen diff --git a/configure.in b/configure.in index 48c3d2e0b..ff308082a 100644 --- a/configure.in +++ b/configure.in @@ -492,6 +492,14 @@ AC_ARG_ENABLE( ) AC_ARG_ENABLE( + [kernel-pfroute], + AS_HELP_STRING([--enable-kernel-pfroute],[enable the PF_ROUTE kernel interface. (default is NO).]), + [if test x$enableval = xyes; then + kernel_pfroute=true + fi] +) + +AC_ARG_ENABLE( [kernel-klips], AS_HELP_STRING([--enable-kernel-klips],[enable the KLIPS kernel interface. (default is NO).]), [if test x$enableval = xyes; then @@ -758,9 +766,34 @@ dnl ========================================== dnl check required libraries and header files dnl ========================================== -AC_HAVE_LIBRARY(dl) +saved_LIBS=$LIBS +LIBS="" +AC_SEARCH_LIBS(dlopen, dl, [DLLIB=$LIBS]) +LIBS=$saved_LIBS +AC_SUBST(DLLIB) + AC_CHECK_FUNCS(backtrace) AC_CHECK_FUNCS(dladdr) +AC_CHECK_FUNCS(prctl) + +AC_CHECK_HEADERS(net/pfkeyv2.h netipsec/ipsec.h) + +AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], +[ + #include <sys/types.h> + #include <sys/socket.h> +]) + +AC_CHECK_MEMBERS([struct sadb_x_policy.sadb_x_policy_priority], [], [], +[ + #include <sys/types.h> + #ifdef HAVE_NET_PFKEYV2_H + #include <net/pfkeyv2.h> + #else + #include <stdint.h> + #include <linux/pfkeyv2.h> + #endif +]) AC_MSG_CHECKING([for gcc atomic operations]) AC_TRY_RUN( @@ -1010,6 +1043,7 @@ AM_CONDITIONAL(USE_EAP_MSCHAPV2, test x$eap_mschapv2 = xtrue) AM_CONDITIONAL(USE_EAP_RADIUS, test x$eap_radius = xtrue) AM_CONDITIONAL(USE_KERNEL_NETLINK, test x$kernel_netlink = xtrue) AM_CONDITIONAL(USE_KERNEL_PFKEY, test x$kernel_pfkey = xtrue) +AM_CONDITIONAL(USE_KERNEL_PFROUTE, test x$kernel_pfroute = xtrue) AM_CONDITIONAL(USE_KERNEL_KLIPS, test x$kernel_klips = xtrue) dnl other options @@ -1092,6 +1126,7 @@ AC_OUTPUT( src/charon/plugins/eap_radius/Makefile src/charon/plugins/kernel_netlink/Makefile src/charon/plugins/kernel_pfkey/Makefile + src/charon/plugins/kernel_pfroute/Makefile src/charon/plugins/kernel_klips/Makefile src/charon/plugins/smp/Makefile src/charon/plugins/sql/Makefile diff --git a/testing/Makefile.am b/testing/Makefile.am index 2ce6f2cd0..ad8d5042a 100644 --- a/testing/Makefile.am +++ b/testing/Makefile.am @@ -6,6 +6,6 @@ EXTRA_DIST = do-tests.in make-testing start-testing stop-testing \ do-tests : do-tests.in sed \ -e "s:\@IPSEC_ROUTING_TABLE\@:$(IPSEC_ROUTING_TABLE):" \ - $< > $@ + $(srcdir)/$@.in > $@ chmod +x $@ |