diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 14:32:23 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 14:32:23 +0000 |
| commit | cec17bd6bf46c506aefcc96701fce4fed844ceee (patch) | |
| tree | 11deae0edf8407ea14d34147762d036de5f005fb /ext | |
| parent | 16e52471d5a79520f4ac12225f07b1876bb6d3d4 (diff) | |
merge revision(s) 16677:
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17347 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 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 |