0.4.3

1 files changed, 26 insertions, 7 deletions

diff --git a/configure.ac b/configure.ac
index 259e289..b95f362 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl 
-AC_INIT(mod_gnutls, 0.4.2.1)
+AC_INIT(mod_gnutls, 0.4.3)
 OOO_CONFIG_NICE(config.nice)
 MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
 AC_PREREQ(2.53)
@@ -28,8 +28,14 @@ CHECK_APACHE(,$AP_VERSION,
 dnl LIBTOOL="`${APR_CONFIG} --apr-libtool`"
 dnl AC_SUBST(LIBTOOL)
 
-MIN_TLS_VERSION=2.1.7
-CHECK_LIBGNUTLS($MIN_TLS_VERSION)
+MIN_TLS_VERSION=2.2.1
+AM_PATH_LIBGNUTLS($MIN_TLS_VERSION,,
+        AC_MSG_ERROR([[
+***  
+*** libgnutls were not found. You may want to get it from
+*** http://www.gnutls.org/
+***
+]]))
 
 dnl CHECK_LUA()
 
@@ -37,7 +43,19 @@ have_apr_memcache=0
 CHECK_APR_MEMCACHE([have_apr_memcache=1], [have_apr_memcache=0])
 AC_SUBST(have_apr_memcache)
 
-MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
+AC_ARG_ENABLE(srp,
+       AS_HELP_STRING([--disable-srp],
+               [unconditionally disable the SRP functionality]),
+       use_srp=$enableval, use_srp=yes)
+
+SRP_CFLAGS=""
+if test "$use_srp" != "no"; then
+        SRP_CFLAGS="-DENABLE_SRP=1"
+fi
+AC_MSG_CHECKING([whether to enable SRP functionality])
+AC_MSG_RESULT($use_srp)
+
+MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
 MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
 
 AC_SUBST(MODULE_CFLAGS)
@@ -49,8 +67,9 @@ AC_OUTPUT
 echo "---"
 echo "Configuration summary for mod_gnutls:"
 echo ""
-echo "   * mod_gnutls version:  ${MOD_GNUTLS_VERSION}"
-echo "   * Apache Modules directory:    ${AP_LIBEXECDIR}"
-echo "   * GnuTLS Library version:      ${LIBGNUTLS_VERSION}"
+echo "   * mod_gnutls version:          ${MOD_GNUTLS_VERSION}"
+echo "   * Apache Modules directory:    ${AP_LIBEXECDIR}"
+echo "   * GnuTLS Library version:      ${LIBGNUTLS_VERSION}"
+echo "   * SRP authentication:          ${use_srp}"
 echo ""
 echo "---"