diff -dPNur gnome-libs-1.4.2/configure.in gnome-libs-1.4.2-ds/configure.in --- gnome-libs-1.4.2/configure.in 2012-01-15 00:48:44.000000000 +0100 +++ gnome-libs-1.4.2-ds/configure.in 2012-01-15 00:46:27.000000000 +0100 @@ -305,43 +305,20 @@ dnl DB_LIB= AC_CHECK_FUNC(dbopen, [], -if test "$prefer_db1" = "yes"; then - AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1", - AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb", - AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3", - AC_CHECK_LIB(db-4, __db185_open, DB_LIB="-ldb-4", - AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode]) - ) - ) - ) - ) -else AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb", - AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1", +# AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1", AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3", AC_CHECK_LIB(db-4, __db185_open, DB_LIB="-ldb-4", AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode]) ) ) ) - ) -fi +# ) ) dnl look for db headers -if test "$prefer_db1" = "yes"; then - AC_CHECK_HEADERS(db_185.h db1/db.h) - if test "$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = nono; then - AC_MSG_ERROR([Berkeley db library required for Gnome]) - fi - AC_DEFINE(PREFER_DB1) -else - AC_CHECK_HEADERS(db.h db_185.h db1/db.h) +AC_CHECK_HEADERS(db.h db_185.h db1/db.h) - if test "$ac_cv_header_db_h$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = nonono; then - AC_MSG_ERROR([Berkeley db library required for Gnome]) - fi -fi dnl dnl This is needed for the gnome-moz-remote program. It doesn't use GDK,