summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
-rw-r--r--configure.ac4
-rw-r--r--m4/libgnutls.m44
2 files changed, 4 insertions, 4 deletions
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`"
29dnl AC_SUBST(LIBTOOL) 29dnl AC_SUBST(LIBTOOL)
30 30
31MIN_TLS_VERSION=2.2.1 31MIN_TLS_VERSION=2.2.1
32CHECK_LIBGNUTLS($MIN_TLS_VERSION)
33AM_PATH_LIBGNUTLS($MIN_TLS_VERSION,, 32AM_PATH_LIBGNUTLS($MIN_TLS_VERSION,,
34 AC_MSG_ERROR([[ 33 AC_MSG_ERROR([[
35*** 34***
@@ -68,6 +67,7 @@ echo "Configuration summary for mod_gnutls:"
68echo "" 67echo ""
69echo " * mod_gnutls version: ${MOD_GNUTLS_VERSION}" 68echo " * mod_gnutls version: ${MOD_GNUTLS_VERSION}"
70echo " * Apache Modules directory: ${AP_LIBEXECDIR}" 69echo " * Apache Modules directory: ${AP_LIBEXECDIR}"
71echo " * GnuTLS Library version: ${LIBGNUTLS_VERSION} | Required: ${MIN_TLS_VERSION}+" 70echo " * GnuTLS Library version: ${LIBGNUTLS_VERSION}"
71echo " * GnuTLS SRP authentication: ${use_srp}"
72echo "" 72echo ""
73echo "---" 73echo "---"
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 ()
156 AC_SUBST(LIBGNUTLS_CFLAGS) 156 AC_SUBST(LIBGNUTLS_CFLAGS)
157 AC_SUBST(LIBGNUTLS_LIBS) 157 AC_SUBST(LIBGNUTLS_LIBS)
158 158
159 LIBGNUTLS_VERSION=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version` 159 LIBGNUTLS_VERSION=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
160 LIBGNUTLS_PREFIX="`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --prefix`" 160 LIBGNUTLS_PREFIX="`$LIBGNUTLS_CONFIG $libgnutls_config_args --prefix`"
161 GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool" 161 GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool"
162 162
163 AC_SUBST(LIBGNUTLS_CFLAGS) 163 AC_SUBST(LIBGNUTLS_CFLAGS)