akr	2011-11-13 16:25:40 +0900 (Sun, 13 Nov 2011)

  New Revision: 33733

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

  Log:
    * ext/dbm/extconf.rb: treat libc as a choice for a library which
      provide ndbm API.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33732)
+++ ChangeLog	(revision 33733)
@@ -1,3 +1,8 @@
+Sun Nov 13 16:24:48 2011  Tanaka Akira  <akr@f...>
+
+	* ext/dbm/extconf.rb: treat libc as a choice for a library which
+	  provide ndbm API.
+
 Sun Nov 13 15:40:43 2011  Tanaka Akira  <akr@f...>
 
 	* ext/dbm/extconf.rb: duplicate $libs and $defs when save them.
Index: ext/dbm/extconf.rb
===================================================================
--- ext/dbm/extconf.rb	(revision 33732)
+++ ext/dbm/extconf.rb	(revision 33733)
@@ -5,10 +5,11 @@
 if dblib = with_config("dbm-type", nil)
   dblib = dblib.split(/[ ,]+/)
 else
-  dblib = %w(db db2 db1 db5 db4 db3 dbm gdbm gdbm_compat qdbm)
+  dblib = %w(libc db db2 db1 db5 db4 db3 dbm gdbm gdbm_compat qdbm)
 end
 
 headers = {
+  "libc" => ["ndbm.h"],
   "db" => ["db.h"],
   "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
   "db2" => ["db2/db.h", "db2.h", "db.h"],
@@ -52,7 +53,8 @@
 
   hdrs = self.fetch(db, ["ndbm.h"])
   if (hdr = hdrs.find {|h| have_type("DBM", h, hsearch)} || hdrs.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)) and
+     (db == 'libc' ? have_func('dbm_open("", 0, 0)', hdr, hsearch) :
+                     have_library(db, 'dbm_open("", 0, 0)', hdr, hsearch)) and
      have_func('dbm_clearerr((DBM *)0)', hdr, hsearch)
     if hsearch
       $defs << hsearch

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