- make memcahe optional

- update for 2.1.x branch changes.
- some mucking around with the conf stuff

1 files changed, 14 insertions, 7 deletions

diff --git a/configure.ac b/configure.ac
index 001f145..086b9f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,16 +1,18 @@
-AC_INIT
+
+AC_INIT(mod_gnutls, 0.1.0)
 OOO_CONFIG_NICE(config.nice)
+AC_PREREQ(2.53)
 AC_CONFIG_SRCDIR([src/mod_gnutls.c])
+AC_CONFIG_AUX_DIR(config)
 AM_MAINTAINER_MODE
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(mod_gnutls, 0.1.0)
-AM_CONFIG_HEADER([include/mod_gnutls_config.h:config.in])
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AM_CONFIG_HEADER(include/mod_gnutls_config.h:config.in)
 
 
 AC_PROG_CC
 AC_PROG_LD
 AC_PROG_INSTALL
-AM_PROG_LIBTOOL
 
 
 AP_VERSION=2.0.40
@@ -19,10 +21,15 @@ CHECK_APACHE(,$AP_VERSION,
     AC_MSG_ERROR([*** Apache version $AP_VERSION not found!])
 )
 
-MIN_TLS_VERSION=1.1.0
+LIBTOOL="`${APR_CONFIG} --apr-libtool`"
+AC_SUBST(LIBTOOL)
+
+MIN_TLS_VERSION=1.2.0
 CHECK_LIBGNUTLS($MIN_TLS_VERSION)
 
-CHECK_APR_MEMCACHE()
+have_apr_memcache=0
+CHECK_APR_MEMCACHE([have_apr_memcache=1], [have_apr_memcache=0])
+AC_SUBST(have_apr_memcache)
 
 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
 MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
@@ -30,7 +37,7 @@ MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
 AC_SUBST(MODULE_CFLAGS)
 AC_SUBST(MODULE_LIBS)
 
-AC_CONFIG_FILES([Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile include/mod_gnutls.h])
 AC_OUTPUT
 
 echo "---"