| --- a/cf/db.m4 |
| +++ b/cf/db.m4 |
| @@ -51,6 +51,8 @@ dnl db_create is used by db3 and db4 and db5 |
| #include <stdio.h> |
| #ifdef HAVE_DBHEADER |
| #include <$dbheader/db.h> |
| + #elif HAVE_DB6_DB_H |
| + #include <db6/db.h> |
| #elif HAVE_DB5_DB_H |
| #include <db5/db.h> |
| #elif HAVE_DB4_DB_H |
| --- a/lib/hdb/db3.c |
| +++ b/lib/hdb/db3.c |
| @@ -276,7 +276,7 @@ |
| } |
| db->hdb_db = d; |
| |
| -#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1) |
| +#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) |
| ret = (*d->open)(db->hdb_db, NULL, fn, NULL, DB_BTREE, myflags, mode); |
| #else |
| ret = (*d->open)(db->hdb_db, fn, NULL, DB_BTREE, myflags, mode); |
| @@ -284,7 +284,7 @@ |
| |
| if (ret == ENOENT) { |
| /* try to open without .db extension */ |
| -#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1) |
| +#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) |
| ret = (*d->open)(db->hdb_db, NULL, db->hdb_name, NULL, DB_BTREE, |
| myflags, mode); |
| #else |
| --- a/cf/db.m4 |
| +++ b/cf/db.m4 |
| @@ -38,6 +38,7 @@ AS_IF([test "x$with_berkeley_db" != xno], |
| fi |
| ])], |
| [AC_CHECK_HEADERS([ \ |
| + db6/db.h \ |
| db5/db.h \ |
| db4/db.h \ |
| db3/db.h \ |