From 492dc5c7d0b3ab251ae19162490678e4bad45b7b Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 5 Dec 2006 19:27:06 +0000 Subject: backport from ruby_1_8 * ext/dbm/extconf.rb: create makefile according to the result of check for dbm header. fixed: [ruby-dev:29445] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@11347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/dbm/extconf.rb | 8 ++++---- version.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4645b26815..9d6f95919b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,11 @@ Sat Sep 23 21:34:15 2006 Yukihiro Matsumoto * lib/cgi.rb (CGI::QueryExtension::read_multipart): CGI content may be empty. a patch from Jamis Buck . +Mon Sep 4 21:43:57 2006 Nobuyoshi Nakada + + * ext/dbm/extconf.rb: create makefile according to the result of check + for dbm header. fixed: [ruby-dev:29445] + Tue Aug 29 19:10:10 2006 Nobuyoshi Nakada * hash.c (rb_hash_s_create): fixed memory leak, based on the patch diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb index 19bfc1f6d3..52ec688952 100644 --- a/ext/dbm/extconf.rb +++ b/ext/dbm/extconf.rb @@ -46,16 +46,16 @@ def db_prefix(func) end if dblib - db_check(dblib) + dbm_hdr = db_check(dblib) else - for dblib in %w(db db2 db1 dbm gdbm gdbm_compat qdbm) - db_check(dblib) and break + dbm_hdr = %w(db db2 db1 dbm gdbm gdbm_compat qdbm).any? do |dblib| + db_check(dblib) end end have_header("cdefs.h") have_header("sys/cdefs.h") -if /DBM_HDR/ =~ $CFLAGS and have_func(db_prefix("dbm_open")) +if dbm_hdr and have_func(db_prefix("dbm_open")) have_func(db_prefix("dbm_clearerr")) unless $dbm_conf_have_gdbm create_makefile("dbm") end diff --git a/version.h b/version.h index 0a4fa1a127..2fe0e33d45 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2006-12-04" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20061204 -#define RUBY_PATCHLEVEL 3 +#define RUBY_PATCHLEVEL 4 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3