From dc3724d56c762d1f41165962b6f345478a4d3f2b Mon Sep 17 00:00:00 2001
From: Nokis Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 20 Feb 2008 20:08:35 +0000
Subject: small fixes

---
diff --git a/configure.ac b/configure.ac
index 63c05e1..5345dc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,6 @@ dnl LIBTOOL="`${APR_CONFIG} --apr-libtool`"
 dnl AC_SUBST(LIBTOOL)
 
 MIN_TLS_VERSION=2.2.1
-CHECK_LIBGNUTLS($MIN_TLS_VERSION)
 AM_PATH_LIBGNUTLS($MIN_TLS_VERSION,,
  	AC_MSG_ERROR([[
 ***  
@@ -68,6 +67,7 @@ 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} | Required: ${MIN_TLS_VERSION}+"
+echo "   * GnuTLS Library version:	${LIBGNUTLS_VERSION}"
+echo "   * GnuTLS SRP authentication:   ${use_srp}"
 echo ""
 echo "---"
diff --git a/m4/libgnutls.m4 b/m4/libgnutls.m4
index 86514ae..3e714fc 100644
--- a/m4/libgnutls.m4
+++ b/m4/libgnutls.m4
@@ -156,8 +156,8 @@ main ()
   AC_SUBST(LIBGNUTLS_CFLAGS)
   AC_SUBST(LIBGNUTLS_LIBS)
 
-  LIBGNUTLS_VERSION=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version`
-  LIBGNUTLS_PREFIX="`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --prefix`"
+  LIBGNUTLS_VERSION=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
+  LIBGNUTLS_PREFIX="`$LIBGNUTLS_CONFIG $libgnutls_config_args --prefix`"
   GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool"
 
   AC_SUBST(LIBGNUTLS_CFLAGS)
--
cgit v0.9.2