--- configure.orig	2007-09-29 16:43:43.000000000 +0200
+++ configure	2007-10-03 13:14:36.000000000 +0200
@@ -942,7 +942,11 @@
 HAVE_SGML_FALSE
 subdirs
 LIBOBJS
-LTLIBOBJS'
+LTLIBOBJS
+HAVE_BASE_TRUE
+HAVE_BASE_FALSE
+HAVE_USERDB_TRUE
+HAVE_USERDB_FALSE'
 ac_subst_files=''
       ac_precious_vars='build_alias
 host_alias
@@ -21215,8 +21219,12 @@
 
 if test "$doauthuserdb" = "no"
 then
+	HAVE_USERDB_TRUE='#'
+	HAVE_USERDB_FALSE=
 	AUTHUSERDB=""
 else
+	HAVE_USERDB_TRUE=
+	HAVE_USERDB_FALSE='#'
 	AUTHUSERDB="authuserdb"
 	LIBAUTHUSERDB="libauthuserdb.la"
 
@@ -22894,6 +22902,20 @@
 fi
 
 
+if test "${with_base+set}" = set; then
+	withval="$with_base"
+	dobase="$withval"
+else
+	dobase="yes"
+fi;
+
+if test "$dobase" = "no"; then
+	HAVE_BASE_TRUE='#'
+	HAVE_BASE_FALSE=
+else
+	HAVE_BASE_TRUE=
+	HAVE_BASE_FALSE='#'
+fi
 
  if test "$HAVE_LDAP" = 1; then
   HAVE_LDAP_TRUE=
@@ -24180,9 +24202,9 @@
 if test "$doauthmysql" = ""
 then
 	LIBS="$MYSQL_LIBS $LIBS"
-	{ echo "$as_me:$LINENO: checking for mysql_connect" >&5
-echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6; }
-if test "${ac_cv_func_mysql_connect+set}" = set; then
+	{ echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6; }
+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -24191,12 +24213,12 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define mysql_connect innocuous_mysql_connect
+#define mysql_real_connect innocuous_mysql_real_connect
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char mysql_connect (); below.
+    which can conflict with char mysql_real_connect (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
 
@@ -24206,7 +24228,7 @@
 # include <assert.h>
 #endif
 
-#undef mysql_connect
+#undef mysql_real_connect
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -24214,18 +24236,18 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char mysql_connect ();
+char mysql_real_connect ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined __stub_mysql_connect || defined __stub___mysql_connect
+#if defined __stub_mysql_real_connect || defined __stub___mysql_real_connect
 choke me
 #endif
 
 int
 main ()
 {
-return mysql_connect ();
+return mysql_real_connect ();
   ;
   return 0;
 }
@@ -24248,20 +24270,20 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_func_mysql_connect=yes
+  ac_cv_func_mysql_real_connect=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_func_mysql_connect=no
+	ac_cv_func_mysql_real_connect=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
-echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6; }
-if test $ac_cv_func_mysql_connect = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6; }
+if test $ac_cv_func_mysql_real_connect = yes; then
   doauthmysql="yes"
 
 fi
@@ -24362,9 +24384,9 @@
 else
 	saveLIBS="$LIBS"
 	LIBS="$MYSQL_LIBS $LIBS"
-	{ echo "$as_me:$LINENO: checking for mysql_connect" >&5
-echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6; }
-if test "${ac_cv_func_mysql_connect+set}" = set; then
+	{ echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6; }
+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -24373,12 +24395,12 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define mysql_connect innocuous_mysql_connect
+#define mysql_real_connect innocuous_mysql_real_connect
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char mysql_connect (); below.
+    which can conflict with char mysql_real_connect (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
 
@@ -24388,7 +24410,7 @@
 # include <assert.h>
 #endif
 
-#undef mysql_connect
+#undef mysql_real_connect
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -24396,18 +24418,18 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char mysql_connect ();
+char mysql_real_connect ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined __stub_mysql_connect || defined __stub___mysql_connect
+#if defined __stub_mysql_real_connect || defined __stub___mysql_real_connect
 choke me
 #endif
 
 int
 main ()
 {
-return mysql_connect ();
+return mysql_real_connect ();
   ;
   return 0;
 }
@@ -24430,20 +24452,20 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_func_mysql_connect=yes
+  ac_cv_func_mysql_real_connect=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_func_mysql_connect=no
+	ac_cv_func_mysql_real_connect=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
-echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6; }
-if test $ac_cv_func_mysql_connect = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6; }
+if test $ac_cv_func_mysql_real_connect = yes; then
   LIBAUTHMYSQL="libauthmysql.la"
 		HAVE_AUTHMYSQL=1
 else
@@ -26915,9 +26937,12 @@
 subdirs!$subdirs$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
+HAVE_BASE_TRUE!$HAVE_BASE_TRUE$ac_delim
+HAVE_BASE_FALSE!$HAVE_BASE_FALSE$ac_delim
+HAVE_USERDB_TRUE!$HAVE_USERDB_TRUE$ac_delim
+HAVE_USERDB_FALSE!$HAVE_USERDB_FALSE$ac_delim
 _ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5