summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-01-09 11:00:40 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-01-09 11:00:40 +0000
commit59b4353ab658e96d3304d9d8359fab7779b8a503 (patch)
tree1e052d6342a94809c894ec7bca16a373371785f3
parentf47932fea63b8953e2c68ddf39ff1e7c15dde577 (diff)
downloadruby-59b4353ab658e96d3304d9d8359fab7779b8a503.tar.gz
ruby-59b4353ab658e96d3304d9d8359fab7779b8a503.tar.xz
ruby-59b4353ab658e96d3304d9d8359fab7779b8a503.zip
* 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/zlib/extconf.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1776baba8..8f35f10c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 9 19:54:35 2006 arton <artonx@yahoo.co.jp>
+
+ * 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:17:12 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/Makefile.sub (OPTFLAGS): I have experienced trouble on y- flag,
diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb
index bf3349a65..6b9bb0574 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 = []