mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/dbm/extconf.rb: don't choose 'dbm' if _GDB_H_ is defined which
is available since GDBM 1.9 because 'gdbm_compat' is appropriate choise since GDBM 1.8.1. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
923bff74b1
commit
fcd8f78ea3
2 changed files with 13 additions and 0 deletions
|
@ -1,3 +1,9 @@
|
|||
Sun Feb 19 00:25:55 2012 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* ext/dbm/extconf.rb: don't choose 'dbm' if _GDB_H_ is defined which
|
||||
is available since GDBM 1.9 because 'gdbm_compat' is appropriate
|
||||
choise since GDBM 1.8.1.
|
||||
|
||||
Sat Feb 18 23:27:00 2012 Kenta Murata <mrkn@mrkn.jp>
|
||||
|
||||
* random.c: remove a duplicated comment.
|
||||
|
|
|
@ -141,6 +141,13 @@ def headers.db_check2(db, hdr)
|
|||
# The original ndbm is provided by libc in 4.3BSD.
|
||||
have_ndbm_header_macro = have_macro('_DBM_IOERR', hdr, hsearch)
|
||||
|
||||
# GDBM provides NDBM functions in libgdbm_compat since GDBM 1.8.1.
|
||||
# GDBM's ndbm.h defines _GDBM_H_ since GDBM 1.9.
|
||||
# So, reject 'gdbm'. 'gdbm_compat' is required.
|
||||
if have_gdbm_header_macro && db == 'gdbm'
|
||||
return false
|
||||
end
|
||||
|
||||
# ndbm.h is provided by the original (4.3BSD) dbm,
|
||||
# Berkeley DB 1 in libc of 4.4BSD and
|
||||
# ndbm compatibility layer of gdbm.
|
||||
|
|
Loading…
Reference in a new issue