mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d3fc4ae7cb
commit
2b2ef5cfce
2 changed files with 17 additions and 0 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
Sun Nov 13 12:43:48 2011 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
|
* 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@gmail.com>
|
Sat Nov 12 21:14:51 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
||||||
|
|
||||||
* test/webrick/test_cgi.rb (class TestWEBrickCGI): respect
|
* test/webrick/test_cgi.rb (class TestWEBrickCGI): respect
|
||||||
|
|
|
@ -29,6 +29,17 @@ headers.found = []
|
||||||
headers.defs = nil
|
headers.defs = nil
|
||||||
|
|
||||||
def headers.db_check(db)
|
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
|
hsearch = nil
|
||||||
|
|
||||||
case db
|
case db
|
||||||
|
|
Loading…
Reference in a new issue