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 | 8048bffae1d1b06a06ea6fe7020dbe18409a5015 (patch) | |
| tree | 58aaaaeab56d1cf119c27d5cd2a3085bb96293e2 /ext | |
| parent | a44e1e86b4970810ecc51c41e47f9bc21f55730c (diff) | |
| download | ruby-8048bffae1d1b06a06ea6fe7020dbe18409a5015.tar.gz ruby-8048bffae1d1b06a06ea6fe7020dbe18409a5015.tar.xz ruby-8048bffae1d1b06a06ea6fe7020dbe18409a5015.zip | |
* ext/zlib/extconf.rb: search zlib1, and regard mswin32 later than VC6
as WIN32. [ruby-core:16984]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -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 b4e76af3c..53b971b18 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 |