diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-29 08:52:31 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-29 08:52:31 +0000 |
| commit | aefc05cd078c62cb6ec8871f9d6cee2fd61534e7 (patch) | |
| tree | b59a5498aeed103cf0b0f9d9affe9d994b7abfa5 | |
| parent | 0496b2e573579de850060b54545a8714be4d107e (diff) | |
* 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/branches/ruby_1_8@16677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/zlib/extconf.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |