nobu	2008-05-29 17:52:31 +0900 (Thu, 29 May 2008)

  New Revision: 16677

  Modified files:
    branches/ruby_1_8/ext/zlib/extconf.rb
    trunk/ext/zlib/extconf.rb

  Log:
    * ext/zlib/extconf.rb: search zlib1, and regard mswin32 later than VC6
      as WIN32.  [ruby-core:16984]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/zlib/extconf.rb?r1=16677&r2=16676&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/zlib/extconf.rb?r1=16677&r2=16676&diff_format=u

Index: ext/zlib/extconf.rb
===================================================================
--- ext/zlib/extconf.rb	(revision 16676)
+++ ext/zlib/extconf.rb	(revision 16677)
@@ -10,7 +10,7 @@
 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 @@
       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
Index: ruby_1_8/ext/zlib/extconf.rb
===================================================================
--- ruby_1_8/ext/zlib/extconf.rb	(revision 16676)
+++ ruby_1_8/ext/zlib/extconf.rb	(revision 16677)
@@ -10,7 +10,7 @@
 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 @@
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/