mame	2010-06-12 00:40:39 +0900 (Sat, 12 Jun 2010)

  New Revision: 28284

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28284

  Log:
    * ext/dbm/extconf.rb: accept Berkley DB version 3, 4 and 5.
      [ruby-dev:41531]

  Modified files:
    trunk/ChangeLog
    trunk/ext/dbm/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28283)
+++ ChangeLog	(revision 28284)
@@ -1,3 +1,8 @@
+Sat Jun 12 00:38:37 2010  Yusuke Endoh  <mame@t...>
+
+	* ext/dbm/extconf.rb: accept Berkley DB version 3, 4 and 5.
+	  [ruby-dev:41531]
+
 Fri Jun 11 23:21:35 2010  Tanaka Akira  <akr@f...>
 
 	* time.c (init_leap_second_info): check the result of
Index: ext/dbm/extconf.rb
===================================================================
--- ext/dbm/extconf.rb	(revision 28283)
+++ ext/dbm/extconf.rb	(revision 28284)
@@ -5,13 +5,16 @@
 if dblib = with_config("dbm-type", nil)
   dblib = dblib.split(/[ ,]+/)
 else
-  dblib = %w(db db2 db1 dbm gdbm gdbm_compat qdbm)
+  dblib = %w(db db2 db1 db5 db4 db3 dbm gdbm gdbm_compat qdbm)
 end
 
 headers = {
   "db" => ["db.h"],
   "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
   "db2" => ["db2/db.h", "db2.h", "db.h"],
+  "db3" => ["db3/db.h", "db3.h", "db.h"],
+  "db4" => ["db4/db.h", "db4.h", "db.h"],
+  "db5" => ["db5/db.h", "db5.h", "db.h"],
   "dbm" => ["ndbm.h"],
   "gdbm" => ["gdbm-ndbm.h", "ndbm.h"],
   "gdbm_compat" => ["gdbm-ndbm.h", "ndbm.h"],
@@ -24,7 +27,7 @@
   hsearch = nil
 
   case db
-  when /^db2?$/
+  when /^db[2-5]?$/
     db_prefix = "__db_n"
     hsearch = "-DDB_DBM_HSEARCH "
   when "gdbm"
@@ -36,7 +39,8 @@
   db_prefix ||= ""
 
   if (have_library(db, db_prefix+"dbm_open") || have_func(db_prefix+"dbm_open")) and
-      hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", h, hsearch)}
+      hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", h, hsearch)} or
+      hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", ["db.h", h], hsearch)}
     have_func(db_prefix+"dbm_clearerr") unless have_gdbm
     $defs << hsearch if hsearch
     $defs << '-DDBM_HDR="<'+hdr+'>"'

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/