diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | m4/libgnutls.m4 | 4 |
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`" | |||
| 29 | dnl AC_SUBST(LIBTOOL) | 29 | dnl AC_SUBST(LIBTOOL) |
| 30 | 30 | ||
| 31 | MIN_TLS_VERSION=2.2.1 | 31 | MIN_TLS_VERSION=2.2.1 |
| 32 | CHECK_LIBGNUTLS($MIN_TLS_VERSION) | ||
| 33 | AM_PATH_LIBGNUTLS($MIN_TLS_VERSION,, | 32 | AM_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:" | |||
| 68 | echo "" | 67 | echo "" |
| 69 | echo " * mod_gnutls version: ${MOD_GNUTLS_VERSION}" | 68 | echo " * mod_gnutls version: ${MOD_GNUTLS_VERSION}" |
| 70 | echo " * Apache Modules directory: ${AP_LIBEXECDIR}" | 69 | echo " * Apache Modules directory: ${AP_LIBEXECDIR}" |
| 71 | echo " * GnuTLS Library version: ${LIBGNUTLS_VERSION} | Required: ${MIN_TLS_VERSION}+" | 70 | echo " * GnuTLS Library version: ${LIBGNUTLS_VERSION}" |
| 71 | echo " * GnuTLS SRP authentication: ${use_srp}" | ||
| 72 | echo "" | 72 | echo "" |
| 73 | echo "---" | 73 | 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 () | |||
| 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) |
