[前][次][番号順一覧][スレッド一覧]

ruby-changes:22654

From: akr <ko1@a...>
Date: Mon, 20 Feb 2012 20:05:42 +0900 (JST)
Subject: [ruby-changes:22654] akr:r34703 (trunk): * ext/dbm/extconf.rb: weaken header/library consistency check if db is

akr	2012-02-20 20:05:31 +0900 (Mon, 20 Feb 2012)

  New Revision: 34703

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

  Log:
    * ext/dbm/extconf.rb: weaken header/library consistency check if db is
      "ndbm".  It seems several (possibly historical) distributions
      provide libndbm.  However the content of libndbm vary: Berkeley DB,
      GDBM or even 4.3BSD NDBM.  (Mandriva, Tru64 UNIX, OpenSuSE,
      SCO OpenServer, ...)
      "ndbm" is not searched automatically now (dblib doesn't contain it)
      but configure --with-dbm-type=ndbm choose libndbm and ndbm.h.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34702)
+++ ChangeLog	(revision 34703)
@@ -1,3 +1,13 @@
+Mon Feb 20 19:57:26 2012  Tanaka Akira  <akr@f...>
+
+	* ext/dbm/extconf.rb: weaken header/library consistency check if db is
+	  "ndbm".  It seems several (possibly historical) distributions
+	  provide libndbm.  However the content of libndbm vary: Berkeley DB,
+	  GDBM or even 4.3BSD NDBM.  (Mandriva, Tru64 UNIX, OpenSuSE,
+	  SCO OpenServer, ...)
+	  "ndbm" is not searched automatically now (dblib doesn't contain it)
+	  but configure --with-dbm-type=ndbm choose libndbm and ndbm.h.
+
 Mon Feb 20 19:15:57 2012  Tanaka Akira  <akr@f...>
 
 	* ext/dbm/extconf.rb: refine variable names.
Index: ext/dbm/extconf.rb
===================================================================
--- ext/dbm/extconf.rb	(revision 34702)
+++ ext/dbm/extconf.rb	(revision 34703)
@@ -182,7 +182,7 @@
   # ndbm compatibility layer of gdbm.
   # So, try to check header/library mismatch.
   #
-  if hdr == 'ndbm.h' && db != 'libc'
+  if hdr == 'ndbm.h' && db != 'libc' && db != 'ndbm'
     if /\Adb\d?\z/ !~ db && have_db_header
       return false
     end

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

[前][次][番号順一覧][スレッド一覧]