diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/dbm/extconf.rb | 3 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Feb 17 10:15:54 2012 Tanaka Akira <akr@fsij.org> + + * ext/dbm/extconf.rb: check _DB_H_ macro unavailable except + Berkeley DB library. + Fri Feb 17 10:14:47 2012 Tanaka Akira <akr@fsij.org> * test/dbm/test_dbm.rb: fix skip condition for libgdbm 1.8.0 or prior. 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) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 128 +#define RUBY_PATCHLEVEL 129 #define RUBY_RELEASE_DATE "2012-02-17" #define RUBY_RELEASE_YEAR 2012 |