From c6e73d2cf82868b2313d8d6d79b501ed1c9c4ac4 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 15 Jun 2008 14:31:47 +0000
Subject: merge revision(s) 16677:

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/zlib/extconf.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ext')

diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb
index 14c8376417..dc0ca9a8db 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
-- 
cgit v1.2.3