merge revision(s) 37527: [Backport #7293]

	* ext/zlib/extconf.rb: Recognize zlibwapi as linking library.
	  Patch by Daniel Berger.
	  [ruby-core:44979] [Feature #6421]


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

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e77eda8c8..05d68b7a2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov  8 17:33:53 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* ext/zlib/extconf.rb: Recognize zlibwapi as linking library.
+	  Patch by Daniel Berger.
+
+	  [ruby-core:44979] [Feature #6421]
+
 Thu Nov  8 16:17:54 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/ruby/test_dir_m17n.rb: remove a garbage.
diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb
index d710226f9c..a61ebae327 100644
--- a/ext/zlib/extconf.rb
+++ b/ext/zlib/extconf.rb
@@ -10,7 +10,7 @@ require 'rbconfig'
 dir_config 'zlib'
 
 
-if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
+if %w'z libz zlib1 zlib zdll zlibwapi'.find {|z| have_library(z, 'deflateReset')} and
     have_header('zlib.h') then
 
   defines = []
diff --git a/version.h b/version.h
index bb26c1bf92..6271512097 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 316
+#define RUBY_PATCHLEVEL 317
 
 #define RUBY_RELEASE_DATE "2012-11-08"
 #define RUBY_RELEASE_YEAR 2012