--- /dev/null
+--- ./configure.orig 2007-10-17 01:58:19.000000000 +0200
++++ ./configure 2008-01-13 21:43:23.948292728 +0100
+@@ -27743,444 +27743,7 @@
+ echo "${ECHO_T}$ol_cv_bdb_minor" >&6
+
+ if test $ol_cv_bdb_major = 4 ; then
+- if test $ol_cv_bdb_minor = 6 ; then
+- if test $ol_cv_lib_db = no ; then
+- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.6)" >&5
+-echo $ECHO_N "checking for Berkeley DB link (-ldb-4.6)... $ECHO_C" >&6
+-if test "${ol_cv_db_db_4_dot_6+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+- ol_DB_LIB=-ldb-4.6
+- ol_LIBS=$LIBS
+- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
+-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#ifdef HAVE_DB_185_H
+-# include <db_185.h>
+-#else
+-# include <db.h>
+-#endif
+-
+-#ifndef DB_VERSION_MAJOR
+-# define DB_VERSION_MAJOR 1
+-#endif
+-
+-#ifndef NULL
+-#define NULL ((void*)0)
+-#endif
+-
+-int
+-main ()
+-{
+-
+-#if DB_VERSION_MAJOR > 1
+- {
+- char *version;
+- int major, minor, patch;
+-
+- version = db_version( &major, &minor, &patch );
+-
+- if( major != DB_VERSION_MAJOR ||
+- minor < DB_VERSION_MINOR )
+- {
+- printf("Berkeley DB version mismatch\n"
+- "\theader: %s\n\tlibrary: %s\n",
+- DB_VERSION_STRING, version);
+- return 1;
+- }
+- }
+-#endif
+-
+-#if DB_VERSION_MAJOR > 2
+- db_env_create( NULL, 0 );
+-#elif DB_VERSION_MAJOR > 1
+- db_appexit( NULL );
+-#else
+- (void) dbopen( NULL, 0, 0, 0, NULL);
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ol_cv_db_db_4_dot_6=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ol_cv_db_db_4_dot_6=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-
+- LIBS="$ol_LIBS"
+-
+-fi
+-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_6" >&5
+-echo "${ECHO_T}$ol_cv_db_db_4_dot_6" >&6
+-
+- if test $ol_cv_db_db_4_dot_6 = yes ; then
+- ol_cv_lib_db=-ldb-4.6
+- fi
+-fi
+-
+- if test $ol_cv_lib_db = no ; then
+- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb46)" >&5
+-echo $ECHO_N "checking for Berkeley DB link (-ldb46)... $ECHO_C" >&6
+-if test "${ol_cv_db_db46+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+- ol_DB_LIB=-ldb46
+- ol_LIBS=$LIBS
+- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
+-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#ifdef HAVE_DB_185_H
+-# include <db_185.h>
+-#else
+-# include <db.h>
+-#endif
+-
+-#ifndef DB_VERSION_MAJOR
+-# define DB_VERSION_MAJOR 1
+-#endif
+-
+-#ifndef NULL
+-#define NULL ((void*)0)
+-#endif
+-
+-int
+-main ()
+-{
+-
+-#if DB_VERSION_MAJOR > 1
+- {
+- char *version;
+- int major, minor, patch;
+-
+- version = db_version( &major, &minor, &patch );
+-
+- if( major != DB_VERSION_MAJOR ||
+- minor < DB_VERSION_MINOR )
+- {
+- printf("Berkeley DB version mismatch\n"
+- "\theader: %s\n\tlibrary: %s\n",
+- DB_VERSION_STRING, version);
+- return 1;
+- }
+- }
+-#endif
+-
+-#if DB_VERSION_MAJOR > 2
+- db_env_create( NULL, 0 );
+-#elif DB_VERSION_MAJOR > 1
+- db_appexit( NULL );
+-#else
+- (void) dbopen( NULL, 0, 0, 0, NULL);
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ol_cv_db_db46=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ol_cv_db_db46=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-
+- LIBS="$ol_LIBS"
+-
+-fi
+-echo "$as_me:$LINENO: result: $ol_cv_db_db46" >&5
+-echo "${ECHO_T}$ol_cv_db_db46" >&6
+-
+- if test $ol_cv_db_db46 = yes ; then
+- ol_cv_lib_db=-ldb46
+- fi
+-fi
+-
+- if test $ol_cv_lib_db = no ; then
+- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-46)" >&5
+-echo $ECHO_N "checking for Berkeley DB link (-ldb-46)... $ECHO_C" >&6
+-if test "${ol_cv_db_db_46+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+- ol_DB_LIB=-ldb-46
+- ol_LIBS=$LIBS
+- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
+-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#ifdef HAVE_DB_185_H
+-# include <db_185.h>
+-#else
+-# include <db.h>
+-#endif
+-
+-#ifndef DB_VERSION_MAJOR
+-# define DB_VERSION_MAJOR 1
+-#endif
+-
+-#ifndef NULL
+-#define NULL ((void*)0)
+-#endif
+-
+-int
+-main ()
+-{
+-
+-#if DB_VERSION_MAJOR > 1
+- {
+- char *version;
+- int major, minor, patch;
+-
+- version = db_version( &major, &minor, &patch );
+-
+- if( major != DB_VERSION_MAJOR ||
+- minor < DB_VERSION_MINOR )
+- {
+- printf("Berkeley DB version mismatch\n"
+- "\theader: %s\n\tlibrary: %s\n",
+- DB_VERSION_STRING, version);
+- return 1;
+- }
+- }
+-#endif
+-
+-#if DB_VERSION_MAJOR > 2
+- db_env_create( NULL, 0 );
+-#elif DB_VERSION_MAJOR > 1
+- db_appexit( NULL );
+-#else
+- (void) dbopen( NULL, 0, 0, 0, NULL);
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ol_cv_db_db_46=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ol_cv_db_db_46=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-
+- LIBS="$ol_LIBS"
+-
+-fi
+-echo "$as_me:$LINENO: result: $ol_cv_db_db_46" >&5
+-echo "${ECHO_T}$ol_cv_db_db_46" >&6
+-
+- if test $ol_cv_db_db_46 = yes ; then
+- ol_cv_lib_db=-ldb-46
+- fi
+-fi
+-
+- if test $ol_cv_lib_db = no ; then
+- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-6)" >&5
+-echo $ECHO_N "checking for Berkeley DB link (-ldb-4-6)... $ECHO_C" >&6
+-if test "${ol_cv_db_db_4_6+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+- ol_DB_LIB=-ldb-4-6
+- ol_LIBS=$LIBS
+- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
+-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#ifdef HAVE_DB_185_H
+-# include <db_185.h>
+-#else
+-# include <db.h>
+-#endif
+-
+-#ifndef DB_VERSION_MAJOR
+-# define DB_VERSION_MAJOR 1
+-#endif
+-
+-#ifndef NULL
+-#define NULL ((void*)0)
+-#endif
+-
+-int
+-main ()
+-{
+-
+-#if DB_VERSION_MAJOR > 1
+- {
+- char *version;
+- int major, minor, patch;
+-
+- version = db_version( &major, &minor, &patch );
+-
+- if( major != DB_VERSION_MAJOR ||
+- minor < DB_VERSION_MINOR )
+- {
+- printf("Berkeley DB version mismatch\n"
+- "\theader: %s\n\tlibrary: %s\n",
+- DB_VERSION_STRING, version);
+- return 1;
+- }
+- }
+-#endif
+-
+-#if DB_VERSION_MAJOR > 2
+- db_env_create( NULL, 0 );
+-#elif DB_VERSION_MAJOR > 1
+- db_appexit( NULL );
+-#else
+- (void) dbopen( NULL, 0, 0, 0, NULL);
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ol_cv_db_db_4_6=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ol_cv_db_db_4_6=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-
+- LIBS="$ol_LIBS"
+-
+-fi
+-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_6" >&5
+-echo "${ECHO_T}$ol_cv_db_db_4_6" >&6
+-
+- if test $ol_cv_db_db_4_6 = yes ; then
+- ol_cv_lib_db=-ldb-4-6
+- fi
+-fi
+-
+- elif test $ol_cv_bdb_minor = 5 ; then
++ if test $ol_cv_bdb_minor = 5 ; then
+ if test $ol_cv_lib_db = no ; then
+ echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.5)" >&5
+ echo $ECHO_N "checking for Berkeley DB link (-ldb-4.5)... $ECHO_C" >&6