diff -ru wvstreams-3.74.0-db1/configure wvstreams-3.74.0/configure --- wvstreams-3.74.0-db1/configure 2003-11-14 22:09:09.000000000 +0100 +++ wvstreams-3.74.0/configure 2003-12-23 19:28:34.022170440 +0100 @@ -4050,7 +4050,7 @@ fi -for ac_header in db.h +for ac_header in db1/db.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -4065,11 +4065,6 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - #ifdef DB_VERSION_MAJOR - #error "this is Berkeley DB 2.x or newer" - #endif - #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -4253,13 +4248,13 @@ fi -echo "$as_me:$LINENO: checking for dbopen in -ldb" >&5 -echo $ECHO_N "checking for dbopen in -ldb... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for dbopen in -ldb1" >&5 +echo $ECHO_N "checking for dbopen in -ldb1... $ECHO_C" >&6 if test "${ac_cv_lib_db_dbopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldb $LIBS" +LIBS="-ldb1 $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -4295,24 +4290,24 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_db_dbopen=yes + ac_cv_lib_db1_dbopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_db_dbopen=no +ac_cv_lib_db1_dbopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_db_dbopen" >&5 -echo "${ECHO_T}$ac_cv_lib_db_dbopen" >&6 -if test $ac_cv_lib_db_dbopen = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_db1_dbopen" >&5 +echo "${ECHO_T}$ac_cv_lib_db1_dbopen" >&6 +if test $ac_cv_lib_db1_dbopen = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBDB 1 _ACEOF - LIBS="-ldb $LIBS" + LIBS="-ldb1 $LIBS" else with_bdb=no diff -ru wvstreams-3.74.0-db1/include/wvautoconf.h.in wvstreams-3.74.0/include/wvautoconf.h.in --- wvstreams-3.74.0-db1/include/wvautoconf.h.in 2003-11-14 22:09:08.000000000 +0100 +++ wvstreams-3.74.0/include/wvautoconf.h.in 2003-12-23 19:34:37.122970728 +0100 @@ -3,8 +3,8 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DB_185_H -/* Define to 1 if you have the header file. */ -#undef HAVE_DB_H +/* Define to 1 if you have the header file. */ +#undef HAVE_DB1_DB_H /* Define to 1 if you have the header file. */ #undef HAVE_FAM_H diff -ru wvstreams-3.74.0-db1/include/wvbdbhash.h wvstreams-3.74.0/include/wvbdbhash.h --- wvstreams-3.74.0-db1/include/wvbdbhash.h 2003-11-14 22:09:08.000000000 +0100 +++ wvstreams-3.74.0/include/wvbdbhash.h 2003-12-23 19:35:05.755617904 +0100 @@ -10,7 +10,7 @@ #include "wvautoconf.h" -#if !defined(HAVE_DB_H) && !defined(HAVE_DB_185_H) +#if !defined(HAVE_DB1_DB_H) && !defined(HAVE_DB_185_H) # error "Sorry, no Berkeley DB support in WvStreams!" #endif diff -ru wvstreams-3.74.0-db1/utils/wvbdbhash.cc wvstreams-3.74.0/utils/wvbdbhash.cc --- wvstreams-3.74.0-db1/utils/wvbdbhash.cc 2003-11-14 22:09:09.000000000 +0100 +++ wvstreams-3.74.0/utils/wvbdbhash.cc 2003-12-23 19:35:35.692066872 +0100 @@ -9,8 +9,8 @@ #include #include -#ifdef HAVE_DB_H -#include +#ifdef HAVE_DB1_DB_H +#include #else #ifdef HAVE_DB_185_H #include diff -ru wvstreams-3.74.0-db1/vars.mk wvstreams-3.74.0/vars.mk --- wvstreams-3.74.0-db1/vars.mk 2003-11-14 22:09:07.000000000 +0100 +++ wvstreams-3.74.0/vars.mk 2003-12-23 19:40:16.418389984 +0100 @@ -126,7 +126,7 @@ endif ifneq ("$(with_bdb)", "no") -libwvutils.so: LDLIBS+=-ldb +libwvutils.so: LDLIBS+=-ldb1 endif ifeq ("$(enable_verbose)", "yes")