1 files changed, 24 insertions, 8 deletions

diff --git a/configure.ac b/configure.ac
index ee2d474..395398f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,17 @@
 dnl Required initializer
-AC_INIT(mod_log_sql, 1.101)
+AC_INIT([mod_log_sql],[1.102])
 OOO_CONFIG_NICE(config.nice)
-AC_PREREQ(2.53)
-AC_CONFIG_HEADERS(config.h)
-
-AC_CONFIG_SRCDIR(mod_log_sql.c)
+AC_PREREQ(2.59)
+AC_CONFIG_HEADERS(include/autoconfig.h)
+AC_CONFIG_SRCDIR(src/mod_log_sql.c)
 
 OOO_MAINTAIN_MODE
 
 dnl Add a test for a compiler.
 AC_PROG_CC
+AC_PROG_LIBTOOL
+
+PKG_CHECK_MODULES(PCRE,libpcre)
 
 APACHE20_VERSION=2.0.40
 APACHE13_VERSION=1.3.20
@@ -18,7 +20,7 @@ CHECK_APACHE($APACHE13_VERSION,$APACHE20_VERSION,
         :,
         AC_MSG_ERROR([*** The correct version Apache was not found!])
         AC_MSG_ERROR([*** You need either Apache 1.3 version $APACHE13_VERSION or greater])
-        AC_MSG_ERROR([*** or Apache 2.0/2.1 version $APACHE20_VERSION or greater!])
+        AC_MSG_ERROR([*** or Apache 2.0/2.2 version $APACHE20_VERSION or greater!])
         )
 
 if test $AP_VERSION = "2.0"; then
@@ -26,8 +28,16 @@ if test $AP_VERSION = "2.0"; then
 else
     WANT_LOGIO_MOD=0
 fi
+
 AC_SUBST(WANT_LOGIO_MOD)
 
+CHECK_APU_HEADERS([apr_dbd.h],
+        WANT_DBD_MOD=1,
+        WANT_DBD_MOD=0)
+
+AC_SUBST(WANT_DBD_MOD)
+CHECK_APU_FUNCS(apr_dbd_transaction_mode_get)
+
 CHECK_MYSQL(
         WANT_MYSQL_MOD=1,
         AC_MSG_WARN([*** Mysql client libraries not found!])
@@ -75,9 +85,12 @@ AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
 
 dnl Write config.status and the Makefile
 
-AC_OUTPUT(Makefile
+AC_CONFIG_FILES([Makefile
+src/Makefile
 docs/Makefile
-contrib/Makefile)
+utility/Makefile
+contrib/Makefile])
+AC_OUTPUT
 
 
 AC_MSG_RESULT([------------------------------------])
@@ -105,6 +118,9 @@ fi
 if test $WANT_DBI_MOD -eq 1; then
     AC_MSG_RESULT([      libDBI Driver])
 fi
+if test $WANT_DBD_MOD -eq 1; then
+    AC_MSG_RESULT([      APR DBD Driver])
+fi
 if test $OOO_MAINTAIN -eq 1; then
     AC_MSG_RESULT([Maintainer mode is on. -Werror is in effect])
 fi