From ccbf4ea1193d2d995ff9e5195a2add2c8851cb6f Mon Sep 17 00:00:00 2001 From: ocean Date: Mon, 9 Jan 2006 11:00:40 +0000 Subject: [PATCH] * ext/zlib/extconf.rb: zlib compiled DLL version 1.2.3 distributed by http://www.zlib.net/ has zdll.lib. [ruby-dev:28209] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/zlib/extconf.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 032e75d334..381113c874 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 9 19:58:56 2006 arton + + * ext/zlib/extconf.rb: zlib compiled DLL version 1.2.3 distributed by + http://www.zlib.net/ has zdll.lib. [ruby-dev:28209] + Mon Jan 9 14:25:00 2006 Hirokazu Yamamoto * win32/Makefile.sub (OPTFLAGS): I have experienced trouble on y- flag, diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb index bf3349a65d..6b9bb05742 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'.find {|z| have_library(z, 'deflateReset')} and +if %w'z libz zlib zdll'.find {|z| have_library(z, 'deflateReset')} and have_header('zlib.h') then defines = []