diff options
author | Nokis Mavrogiannopoulos <nmav@gnutls.org> | 2008-02-20 20:05:11 (GMT) |
---|---|---|
committer | Nokis Mavrogiannopoulos <nmav@gnutls.org> | 2008-02-20 20:05:11 (GMT) |
commit | b997c05d0753e7fb30d0654dd311ea7598db962d (patch) | |
tree | 1fec51dc9e8f93ba5365e0151889d087dc2f8611 /configure.ac | |
parent | e83d99ee88dc34d534c9d2c79a9522b47fcc3f3a (diff) |
added disable-srp option
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 259e289..63c05e1 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | dnl | 1 | dnl |
2 | AC_INIT(mod_gnutls, 0.4.2.1) | 2 | AC_INIT(mod_gnutls, 0.4.3) |
3 | OOO_CONFIG_NICE(config.nice) | 3 | OOO_CONFIG_NICE(config.nice) |
4 | MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION | 4 | MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION |
5 | AC_PREREQ(2.53) | 5 | AC_PREREQ(2.53) |
@@ -28,8 +28,15 @@ CHECK_APACHE(,$AP_VERSION, | |||
28 | dnl LIBTOOL="`${APR_CONFIG} --apr-libtool`" | 28 | dnl LIBTOOL="`${APR_CONFIG} --apr-libtool`" |
29 | dnl AC_SUBST(LIBTOOL) | 29 | dnl AC_SUBST(LIBTOOL) |
30 | 30 | ||
31 | MIN_TLS_VERSION=2.1.7 | 31 | MIN_TLS_VERSION=2.2.1 |
32 | CHECK_LIBGNUTLS($MIN_TLS_VERSION) | 32 | CHECK_LIBGNUTLS($MIN_TLS_VERSION) |
33 | AM_PATH_LIBGNUTLS($MIN_TLS_VERSION,, | ||
34 | AC_MSG_ERROR([[ | ||
35 | *** | ||
36 | *** libgnutls were not found. You may want to get it from | ||
37 | *** http://www.gnutls.org/ | ||
38 | *** | ||
39 | ]])) | ||
33 | 40 | ||
34 | dnl CHECK_LUA() | 41 | dnl CHECK_LUA() |
35 | 42 | ||
@@ -37,6 +44,16 @@ have_apr_memcache=0 | |||
37 | CHECK_APR_MEMCACHE([have_apr_memcache=1], [have_apr_memcache=0]) | 44 | CHECK_APR_MEMCACHE([have_apr_memcache=1], [have_apr_memcache=0]) |
38 | AC_SUBST(have_apr_memcache) | 45 | AC_SUBST(have_apr_memcache) |
39 | 46 | ||
47 | AC_ARG_ENABLE(srp, | ||
48 | AS_HELP_STRING([--disable-srp], | ||
49 | [unconditionally disable the SRP functionality]), | ||
50 | use_srp=$enableval, use_srp=yes) | ||
51 | if test "$use_srp" != "no"; then | ||
52 | AC_DEFINE_UNQUOTED(ENABLE_SRP, 1, [whether to enable SRP]) | ||
53 | fi | ||
54 | AC_MSG_CHECKING([whether to enable SRP functionality]) | ||
55 | AC_MSG_RESULT($use_srp) | ||
56 | |||
40 | MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}" | 57 | MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}" |
41 | MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}" | 58 | MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}" |
42 | 59 | ||
@@ -51,6 +68,6 @@ echo "Configuration summary for mod_gnutls:" | |||
51 | echo "" | 68 | echo "" |
52 | echo " * mod_gnutls version: ${MOD_GNUTLS_VERSION}" | 69 | echo " * mod_gnutls version: ${MOD_GNUTLS_VERSION}" |
53 | echo " * Apache Modules directory: ${AP_LIBEXECDIR}" | 70 | echo " * Apache Modules directory: ${AP_LIBEXECDIR}" |
54 | echo " * GnuTLS Library version: ${LIBGNUTLS_VERSION}" | 71 | echo " * GnuTLS Library version: ${LIBGNUTLS_VERSION} | Required: ${MIN_TLS_VERSION}+" |
55 | echo "" | 72 | echo "" |
56 | echo "---" | 73 | echo "---" |