--- configure.in.orig	2007-01-21 15:37:46.000000000 +0100
+++ configure.in	2007-01-22 21:23:34.000000000 +0100
@@ -34,14 +34,14 @@
 dnl
 dnl test for MySQL
 dnl
-AC_ARG_WITH(mysql,
- --with-mysql=<directory>		mysql installed in <directory>,[
-if test $withval != yes
-then
+AC_ARG_WITH(mysql, AS_HELP_STRING([--with-mysql=<directory>],[mysql installed in <directory>]),[with_mysql=$withval
+],[with_mysql=no])
+if test $withval != yes -a $withval != no ; then
         dir=$withval
 else
         dir="/usr/local"
 fi
+if test $withval != no; then
 mysqldir=""
 AC_MSG_CHECKING(for MySQL files)
 for d in $dir /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql
@@ -108,8 +108,7 @@
 	fi
 
 fi      
-])      
-
+fi
 
 dnl
 dnl Check whether the user wants log IP-addresses as strings rather
@@ -130,14 +129,16 @@
 dnl
 dnl test for PostgreSQL
 dnl
-AC_ARG_WITH(pgsql,
- --with-pgsql=<directory>		pgsql installed in <directory>,[
-if test $withval != yes
+
+AC_ARG_WITH(pgsql, AS_HELP_STRING([--with-pgsql=<directory>],[pgsql installed in <directory>]),[with_mysql=$withval],[with_mysql=no])
+if test $withval != yes -a $withval != no
 then
         dir=$withval
 else
         dir="/usr/local"
 fi
+if test $withval = yes
+then
 pgsqldir=""
 AC_MSG_CHECKING(for PGSQL files)
 for d in $dir /usr /usr/local /usr/local/pgsql /opt/pgsql /opt/packages/pgsql
@@ -181,7 +182,7 @@
 	AC_SUBST(PGSQL_LIB)
 
 fi      
-])      
+fi      
 
 dnl
 dnl Check whether the user wants to log IP-addresses as strings rather