akr	2011-11-13 12:47:07 +0900 (Sun, 13 Nov 2011)

  New Revision: 33731

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

  Log:
    * ext/dbm/extconf.rb: rollback $libs and $defs when db detection is
      failed.  It fixes -lgdbm -lqdbm when the system has qdbm and gdbm
      without gdbm_compat.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33730)
+++ ChangeLog	(revision 33731)
@@ -1,3 +1,9 @@
+Sun Nov 13 12:43:48 2011  Tanaka Akira  <akr@f...>
+
+	* ext/dbm/extconf.rb: rollback $libs and $defs when db detection is
+	  failed.  It fixes -lgdbm -lqdbm when the system has qdbm and gdbm
+	  without gdbm_compat.
+
 Sat Nov 12 21:14:51 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* test/webrick/test_cgi.rb (class TestWEBrickCGI): respect
Index: ext/dbm/extconf.rb
===================================================================
--- ext/dbm/extconf.rb	(revision 33730)
+++ ext/dbm/extconf.rb	(revision 33731)
@@ -29,6 +29,17 @@
 headers.defs = nil
 
 def headers.db_check(db)
+  old_libs = $libs
+  old_defs = $defs
+  result = db_check2(db)
+  if !result
+    $libs = old_libs
+    $defs = old_defs
+  end
+  result
+end
+
+def headers.db_check2(db)
   hsearch = nil
 
   case db

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