1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/zlib/extconf.rb: search zlib1, and regard mswin32 later than VC6

as WIN32.  [ruby-core:16984]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-05-29 08:52:31 +00:00
parent 8f706b2d44
commit 441be3ca06

View file

@ -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