akr	2011-11-11 23:01:25 +0900 (Fri, 11 Nov 2011)

  New Revision: 33710

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

  Log:
    * ext/dbm/extconf.rb: db_prefix is not required now.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33709)
+++ ChangeLog	(revision 33710)
@@ -1,3 +1,7 @@
+Fri Nov 11 23:00:46 2011  Tanaka Akira  <akr@f...>
+
+	* ext/dbm/extconf.rb: db_prefix is not required now.
+
 Fri Nov 11 21:13:30 2011  Tanaka Akira  <akr@f...>
 
 	* ext/gdbm/gdbm.c (fgdbm_initialize): use GDBM_CLOEXEC if available.
Index: ext/dbm/extconf.rb
===================================================================
--- ext/dbm/extconf.rb	(revision 33709)
+++ ext/dbm/extconf.rb	(revision 33710)
@@ -29,13 +29,11 @@
 headers.defs = nil
 
 def headers.db_check(db)
-  db_prefix = nil
   have_gdbm = false
   hsearch = nil
 
   case db
   when /^db[2-5]?$/
-    db_prefix = "__db_n"
     hsearch = "-DDB_DBM_HSEARCH"
   when "gdbm"
     have_gdbm = true
@@ -43,12 +41,11 @@
     have_gdbm = true
     have_library("gdbm") or return false
   end
-  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)} 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
+  if (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)}) and
+     (have_library(db, 'dbm_open("", 0, 0)', hdr, hsearch) || have_func('dbm_open("", 0, 0)', hdr, hsearch))
+    have_func('dbm_clearerr((DBM *)0)', hdr, hsearch) unless have_gdbm
     if hsearch
       $defs << hsearch
       @defs = hsearch

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