akr	2012-02-17 00:05:46 +0900 (Fri, 17 Feb 2012)

  New Revision: 34644

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

  Log:
    * ext/dbm/extconf.rb: check _DB_H_ macro unavailable except
      Berkeley DB library.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34643)
+++ ChangeLog	(revision 34644)
@@ -1,3 +1,8 @@
+Fri Feb 17 00:04:21 2012  Tanaka Akira  <akr@f...>
+
+	* ext/dbm/extconf.rb: check _DB_H_ macro unavailable except
+	  Berkeley DB library.
+
 Thu Feb 16 05:41:35 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* insns.def (splatarray): make new array if flag is set.
Index: ext/dbm/extconf.rb
===================================================================
--- ext/dbm/extconf.rb	(revision 34643)
+++ ext/dbm/extconf.rb	(revision 34644)
@@ -79,7 +79,8 @@
   if have_type("DBM", 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)
+     have_func('dbm_clearerr((DBM *)0)', hdr, hsearch) and
+     (/\Adb\d?\z/ =~ db || db == 'libc' || !have_macro('_DB_H_', hdr, hsearch)) # _DB_H_ should not be defined except Berkeley DB.
     case db
     when /\Adb\d?\z/
       have_func('db_version((int *)0, (int *)0, (int *)0)', hdr, hsearch)

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