diff options
| author | luislavena <luislavena@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-06 18:50:53 +0000 |
|---|---|---|
| committer | luislavena <luislavena@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-06 18:50:53 +0000 |
| commit | 95cd5aaa48f6b39062b5c4a5950928817b9bf8d6 (patch) | |
| tree | 3511722bd207b50155a0cb698840bd571bae0030 | |
| parent | 81bfd9a6c0960e0a20a2b93a4db8f38c1507998d (diff) | |
| download | ruby-95cd5aaa48f6b39062b5c4a5950928817b9bf8d6.tar.gz | |
Recognize zlibwapi as linking library
* ext/zlib/extconf.rb: Recognize zlibwapi as linking library.
Patch by Daniel Berger.
[ruby-core:44979] [Feature #6421]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37527 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/zlib/extconf.rb | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Wed Nov 7 03:45:12 2012 Luis Lavena <luislavena@gmail.com> + + * ext/zlib/extconf.rb: Recognize zlibwapi as linking library. + Patch by Daniel Berger. + + [ruby-core:44979] [Feature #6421] + Wed Nov 7 02:06:40 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca> * enumerator.c: New method #size; constructor accepts size. diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb index c49c29d463..b4348ceca7 100644 --- a/ext/zlib/extconf.rb +++ b/ext/zlib/extconf.rb @@ -10,7 +10,7 @@ require 'rbconfig' dir_config 'zlib' -if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and +if %w'z libz zlib1 zlib zdll zlibwapi'.find {|z| have_library(z, 'deflateReset')} and have_header('zlib.h') then defines = [] |