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

1 files changed, 83 insertions, 4 deletions

diff --git a/configure.in b/configure.in
index 751375439..4b0b0ed56 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ dnl ===========================
 dnl  initialize & set some vars
 dnl ===========================
 
-AC_INIT(strongSwan,4.1.8)
+AC_INIT(strongSwan,4.1.10)
 AM_INIT_AUTOMAKE(tar-ustar)
 AC_C_BIGENDIAN
 AC_SUBST(confdir, '${sysconfdir}')
@@ -156,6 +156,18 @@ AC_ARG_ENABLE(
 AM_CONDITIONAL(USE_LIBLDAP, test x$ldap = xtrue)
 
 AC_ARG_ENABLE(
+    [stroke],
+    AS_HELP_STRING([--disable-stroke],[disable charons stroke (pluto compatibility) configuration backend. (default is NO).]),
+    [if test x$enableval = xyes; then
+        stroke=true
+     else
+        stroke=false
+    fi],
+    stroke=true
+)
+AM_CONDITIONAL(USE_STROKE, test x$stroke = xtrue)
+
+AC_ARG_ENABLE(
     [dbus],
     AS_HELP_STRING([--enable-dbus],[enable DBUS configuration and control interface (default is NO). Requires libdbus.]),
     [if test x$enableval = xyes; then
@@ -220,7 +232,34 @@ AC_ARG_ENABLE(
         eap_sim=true
     fi]
 )
-AM_CONDITIONAL(BUILD_EAP_SIM, test x$eap_sim = xtrue)
+AM_CONDITIONAL(USE_EAP_SIM, test x$eap_sim = xtrue)
+
+AC_ARG_ENABLE(
+    [eap-identity],
+    AS_HELP_STRING([--enable-eap-identity],[build EAP module providing EAP-Identity helper (default is NO).]),
+    [if test x$enableval = xyes; then
+        eap_identity=true
+    fi]
+)
+AM_CONDITIONAL(USE_EAP_IDENTITY, test x$eap_identity = xtrue)
+
+AC_ARG_ENABLE(
+    [eap-md5],
+    AS_HELP_STRING([--enable-eap-md5],[build MD5 (CHAP) authenication module for EAP (default is NO).]),
+    [if test x$enableval = xyes; then
+        eap_md5=true
+    fi]
+)
+AM_CONDITIONAL(USE_EAP_MD5, test x$eap_md5 = xtrue)
+
+AC_ARG_ENABLE(
+    [eap-aka],
+    AS_HELP_STRING([--enable-eap-aka],[build AKA authentication module for EAP (default is NO).]),
+    [if test x$enableval = xyes; then
+        eap_aka=true
+    fi]
+)
+AM_CONDITIONAL(USE_EAP_AKA, test x$eap_aka = xtrue)
 
 AC_ARG_ENABLE(
     [nat-transport],
@@ -306,6 +345,46 @@ AC_ARG_ENABLE(
 )
 AM_CONDITIONAL(USE_SELF_TEST, test x$self_test = xtrue)
 
+AC_ARG_ENABLE(
+    [pluto],
+    AS_HELP_STRING([--disable-pluto],[disable the IKEv1 keying daemon pluto. (default is NO).]),
+    [if test x$enableval = xyes; then
+        pluto=true
+     else
+        pluto=false
+    fi],
+    pluto=true
+)
+AM_CONDITIONAL(USE_PLUTO, test x$pluto = xtrue)
+
+AC_ARG_ENABLE(
+    [charon],
+    AS_HELP_STRING([--disable-charon],[disable the IKEv2 keying daemon charon. (default is NO).]),
+    [if test x$enableval = xyes; then
+        charon=true
+     else
+        charon=false
+    fi],
+    charon=true
+)
+AM_CONDITIONAL(USE_CHARON, test x$charon = xtrue)
+
+AC_ARG_ENABLE(
+    [tools],
+    AS_HELP_STRING([--disable-tools],[disable additional utilities (openac and scepclient). (default is NO).]),
+    [if test x$enableval = xyes; then
+        tools=true
+     else
+        tools=false
+    fi],
+    tools=true
+)
+AM_CONDITIONAL(USE_TOOLS, test x$tools = xtrue)
+
+AM_CONDITIONAL(USE_PLUTO_OR_CHARON, test x$pluto = xtrue -o x$charon = xtrue)
+AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$tools = xtrue)
+AM_CONDITIONAL(USE_FILE_CONFIG, test x$pluto = xtrue -o x$stroke = xtrue)
+
 dnl =========================
 dnl  check required programs
 dnl =========================
@@ -335,13 +414,13 @@ if test "$http" = "true"; then
 fi
 
 if test "$xml" = "true"; then
-	PKG_CHECK_MODULES(xml, libxml-2.0,, AC_MSG_ERROR([No libxml2 package information found]))
+	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]))
+	PKG_CHECK_MODULES(dbus, [dbus-1],, AC_MSG_ERROR([No libdbus package information found]))
 	AC_SUBST(dbus_CFLAGS)
 	AC_SUBST(dbus_LIBS)
 fi