merge revision(s) 16677:

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 265ab68b86..d93647fa10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 15 23:31:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/zlib/extconf.rb: search zlib1, and regard mswin32 later than VC6
+	  as WIN32.  [ruby-core:16984]
+
 Sun Jun 15 23:28:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb
index b4e76af3c6..53b971b189 100644
--- a/ext/zlib/extconf.rb
+++ b/ext/zlib/extconf.rb
@@ -10,7 +10,7 @@ require 'rbconfig'
 dir_config 'zlib'
 
 
-if %w'z libz zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
+if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
     have_header('zlib.h') then
 
   defines = []
@@ -22,7 +22,7 @@ if %w'z libz zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
       os_code = 'AMIGA'
     when /\Aos2[\-_]emx\z/ then
       os_code = 'OS2'
-    when 'mswin32', 'mingw32', 'bccwin32' then
+    when /mswin|mingw|bccwin/ then
       # NOTE: cygwin should be regarded as Unix.
       os_code = 'WIN32'
     else
diff --git a/version.h b/version.h
index d1377a42c7..1381fbd712 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 220
+#define RUBY_PATCHLEVEL 221
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8