From b997c05d0753e7fb30d0654dd311ea7598db962d Mon Sep 17 00:00:00 2001
From: Nokis Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 20 Feb 2008 20:05:11 +0000
Subject: added disable-srp option

---
(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 259e289..63c05e1 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,15 @@ CHECK_APACHE(,$AP_VERSION,
 dnl LIBTOOL="`${APR_CONFIG} --apr-libtool`"
 dnl AC_SUBST(LIBTOOL)
 
-MIN_TLS_VERSION=2.1.7
+MIN_TLS_VERSION=2.2.1
 CHECK_LIBGNUTLS($MIN_TLS_VERSION)
+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,6 +44,16 @@ have_apr_memcache=0
 CHECK_APR_MEMCACHE([have_apr_memcache=1], [have_apr_memcache=0])
 AC_SUBST(have_apr_memcache)
 
+AC_ARG_ENABLE(srp,
+       AS_HELP_STRING([--disable-srp],
+               [unconditionally disable the SRP functionality]),
+       use_srp=$enableval, use_srp=yes)
+if test "$use_srp" != "no"; then
+	AC_DEFINE_UNQUOTED(ENABLE_SRP, 1, [whether to enable SRP])
+fi
+AC_MSG_CHECKING([whether to enable SRP functionality])
+AC_MSG_RESULT($use_srp)
+
 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
 MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
 
@@ -51,6 +68,6 @@ 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 "   * GnuTLS Library version:	${LIBGNUTLS_VERSION} | Required: ${MIN_TLS_VERSION}+"
 echo ""
 echo "---"
--
cgit v0.9.2