INN commit: trunk (m4/berkeleydb.m4 storage/ovdb/ovdb.c)

INN Commit Russ_Allbery at isc.org
Sat Apr 12 21:53:19 UTC 2008


    Date: Saturday, April 12, 2008 @ 14:53:19
  Author: iulius
Revision: 7764

INN now supports Berkeley DB 4.6.  Thanks to Marco d'Itri for the patch.

Modified:
  trunk/m4/berkeleydb.m4
  trunk/storage/ovdb/ovdb.c

---------------------+
 m4/berkeleydb.m4    |    5 +++--
 storage/ovdb/ovdb.c |    6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

Modified: m4/berkeleydb.m4
===================================================================
--- m4/berkeleydb.m4	2008-04-12 21:41:32 UTC (rev 7763)
+++ m4/berkeleydb.m4	2008-04-12 21:53:19 UTC (rev 7764)
@@ -25,7 +25,8 @@
 
     dnl First check the default installation locations.
     if test x"$DB_DIR" = xyes ; then
-        for version in BerkeleyDB.4.4 BerkeleyDB.4.3 BerkeleyDB.4.2 \
+        for version in BerkeleyDB.4.6 BerkeleyDB.4.5 \
+                       BerkeleyDB.4.4 BerkeleyDB.4.3 BerkeleyDB.4.2 \
                        BerkeleyDB.4.1 BerkeleyDB.4.0 \
                        BerkeleyDB.3.3 BerkeleyDB.3.2 BerkeleyDB.3.1 \
                        BerkeleyDB.3.0 BerkeleyDB ; do
@@ -39,7 +40,7 @@
     dnl If not found there, check the default locations for some BSD ports and
     dnl Linux distributions.  They each do things in different ways.
     if test x"$DB_DIR" = xyes ; then
-        for version in db44 db43 db42 db41 db4 db3 db2 ; do
+        for version in db46 db45 db44 db43 db42 db41 db4 db3 db2 ; do
             if test -d "/usr/local/include/$version" ; then
                 DB_CPPFLAGS="-I/usr/local/include/$version"
                 DB_LDFLAGS="-L/usr/local/lib"

Modified: storage/ovdb/ovdb.c
===================================================================
--- storage/ovdb/ovdb.c	2008-04-12 21:41:32 UTC (rev 7763)
+++ storage/ovdb/ovdb.c	2008-04-12 21:53:19 UTC (rev 7764)
@@ -1584,7 +1584,13 @@
 
     OVDBenv->set_errcall(OVDBenv, OVDBerror);
     OVDBenv->set_cachesize(OVDBenv, 0, ovdb_conf.cachesize, ovdb_conf.ncache);
+#if DB_VERSION_MAJOR >= 4
+    OVDBenv->set_lk_max_locks(OVDBenv, ovdb_conf.maxlocks);
+    OVDBenv->set_lk_max_lockers(OVDBenv, ovdb_conf.maxlocks);
+    OVDBenv->set_lk_max_objects(OVDBenv, ovdb_conf.maxlocks);
+#else
     OVDBenv->set_lk_max(OVDBenv, ovdb_conf.maxlocks);
+#endif
 
 #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR >= 2)
     if(ovdb_conf.txn_nosync)



More information about the inn-committers mailing list