diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-17 01:16:19 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-17 01:16:19 +0000 |
| commit | c32308780c6262791d2c86af3414bb12faca5167 (patch) | |
| tree | c12e4386feea9ea7013ed7d1f8e47d56cf1f42ec /ext | |
| parent | 35586754886d9ff36c5e2ec1a98aef0a3a3ab3ad (diff) | |
merge revision(s) 34644:
* ext/dbm/extconf.rb: check _DB_H_ macro unavailable except
Berkeley DB library.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/dbm/extconf.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb index 5f9d16844e..bedd1131f0 100644 --- a/ext/dbm/extconf.rb +++ b/ext/dbm/extconf.rb @@ -250,7 +250,8 @@ def headers.db_check2(db, hdr) 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) |