[svn-upgrade] Integrating new upstream version, strongswan (4.1.8)

1 files changed, 97 insertions, 6 deletions

diff --git a/configure.in b/configure.in
index 13f0ae71d..751375439 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ dnl ===========================
 dnl  initialize & set some vars
 dnl ===========================
 
-AC_INIT(strongSwan,4.1.4)
+AC_INIT(strongSwan,4.1.8)
 AM_INIT_AUTOMAKE(tar-ustar)
 AC_C_BIGENDIAN
 AC_SUBST(confdir, '${sysconfdir}')
@@ -108,6 +108,20 @@ AC_ARG_WITH(
 AC_SUBST(LINUX_HEADERS)
 
 AC_ARG_WITH(
+    [routing-table],
+    AS_HELP_STRING([--with-routing-table=num],[use routing table for IPsec routes (default: 220)]),
+    [AC_DEFINE_UNQUOTED(IPSEC_ROUTING_TABLE, $withval) AC_SUBST(IPSEC_ROUTING_TABLE, "$withval")], 
+    [AC_DEFINE_UNQUOTED(IPSEC_ROUTING_TABLE, 220) AC_SUBST(IPSEC_ROUTING_TABLE, "220")]
+)
+
+AC_ARG_WITH(
+    [routing-table-prio],
+    AS_HELP_STRING([--with-routing-table-prio=prio],[priority for IPsec routing table (default: 220)]),
+    [AC_DEFINE_UNQUOTED(IPSEC_ROUTING_TABLE_PRIO, $withval) AC_SUBST(IPSEC_ROUTING_TABLE_PRIO, "$withval")], 
+    [AC_DEFINE_UNQUOTED(IPSEC_ROUTING_TABLE_PRIO, 220) AC_SUBST(IPSEC_ROUTING_TABLE_PRIO, "220")]
+)
+
+AC_ARG_WITH(
     [uid],
     AS_HELP_STRING([--with-uid=uid],[change user of the daemons to UID after startup (default is 0).]),
     [AC_DEFINE_UNQUOTED(IPSEC_UID, $withval) AC_SUBST(ipsecuid, "$withval")],
@@ -162,6 +176,16 @@ AC_ARG_ENABLE(
 AM_CONDITIONAL(USE_LIBXML, test x$xml = xtrue)
 
 AC_ARG_ENABLE(
+    [sqlite],
+    AS_HELP_STRING([--enable-sqlite],[enable SQLite configuration backend (default is NO). Requires libsqlite3.]),
+    [if test x$enableval = xyes; then
+        sqlite=true
+        AC_DEFINE(LIBSQLITE)
+    fi]
+)
+AM_CONDITIONAL(USE_LIBSQLITE, test x$sqlite = xtrue)
+
+AC_ARG_ENABLE(
     [smartcard],
     AS_HELP_STRING([--enable-smartcard],[enable smartcard support (default is NO).]),
     [if test x$enableval = xyes; then
@@ -219,6 +243,69 @@ AC_ARG_ENABLE(
 )
 AM_CONDITIONAL(USE_VENDORID, test x$vendor_id = xtrue)
 
+AC_ARG_ENABLE(
+    [xauth-vid],
+    AS_HELP_STRING([--disable-xauth-vid],[disable the sending of the XAUTH vendor ID (default is NO).]),
+    [if test x$enableval = xyes; then
+        xauth_vid=true
+     else
+        xauth_vid=false
+    fi],
+    xauth_vid=true
+)
+AM_CONDITIONAL(USE_XAUTH_VID, test x$xauth_vid = xtrue)
+
+AC_ARG_ENABLE(
+    [uml],
+    AS_HELP_STRING([--enable-uml],[build the UML test framework (default is NO).]),
+    [if test x$enableval = xyes; then
+        uml=true
+    fi]
+)
+AM_CONDITIONAL(USE_UML, test x$uml = xtrue)
+
+AC_ARG_ENABLE(
+    [manager],
+    AS_HELP_STRING([--enable-manager],[build web management console (default is NO).]),
+    [if test x$enableval = xyes; then
+        manager=true
+    fi]
+)
+AM_CONDITIONAL(USE_MANAGER, test x$manager = xtrue)
+
+AC_ARG_ENABLE(
+    [p2p],
+    AS_HELP_STRING([--enable-p2p],[enable peer-to-peer NAT traversal (default is NO).]),
+    [if test x$enableval = xyes; then
+        p2p=true
+        AC_DEFINE(P2P)
+    fi]
+)
+AM_CONDITIONAL(USE_P2P, test x$p2p = xtrue)
+
+AC_ARG_ENABLE(
+    [integrity-test],
+    AS_HELP_STRING([--enable-integrity-test],[enable the integrity test of the crypto library (default is NO).]),
+    [if test x$enableval = xyes; then
+        integrity_test=true 
+        AC_DEFINE(INTEGRITY_TEST)
+     fi]
+)
+AM_CONDITIONAL(USE_INTEGRITY_TEST, test x$integrity_test = xtrue)
+
+AC_ARG_ENABLE(
+    [self-test],
+    AS_HELP_STRING([--disable-self-test],[disable the self-test of the crypto library (default is NO).]),
+    [if test x$enableval = xyes; then
+        self_test=true
+     else
+        self_test=false
+        AC_DEFINE(NO_SELF_TEST)
+     fi],
+        self_test=true
+)
+AM_CONDITIONAL(USE_SELF_TEST, test x$self_test = xtrue)
+
 dnl =========================
 dnl  check required programs
 dnl =========================
@@ -247,17 +334,18 @@ if test "$http" = "true"; then
     AC_HAVE_LIBRARY([curl],[LIBS="$LIBS"],[AC_MSG_ERROR([HTTP enabled, but library curl not found])])
 fi
 
+if test "$xml" = "true"; then
+	PKG_CHECK_MODULES(xml, libxml-2.0,, AC_MSG_ERROR([No libxml2 package information found]))
+	AC_SUBST(xml_CFLAGS)
+	AC_SUBST(xml_LIBS)
+fi
+
 if test "$dbus" = "true"; then
 	PKG_CHECK_MODULES(dbus, dbus-1,, AC_MSG_ERROR([No libdbus package information found]))
 	AC_SUBST(dbus_CFLAGS)
 	AC_SUBST(dbus_LIBS)
 fi
 
-if test "$xml" = "true"; then
-	PKG_CHECK_MODULES(xml, libxml-2.0,, AC_MSG_ERROR([No libxml2 package information found]))
-	AC_SUBST(xml_CFLAGS)
-	AC_SUBST(xml_LIBS)
-fi
 
 dnl =============================
 dnl  check required header files
@@ -311,4 +399,7 @@ AC_OUTPUT(
 	src/_copyright/Makefile
 	src/openac/Makefile
 	src/scepclient/Makefile
+	src/dumm/Makefile
+	src/manager/Makefile
+	testing/Makefile
 )