aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-23 14:18:41 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-23 14:18:41 +0000
commitd02ec20e3fd7550af1d6df2ee4839223d9fd9a15 (patch)
treed465e1bdedcc5cdabab04b7b75b03c6b79123738
parentd6731c2e6b97bf6a31169746face99e5647d374e (diff)
downloadruby-d02ec20e3fd7550af1d6df2ee4839223d9fd9a15.tar.gz
zlib: no checks [ci skip]
* ext/zlib/extconf.rb: no feature checks when building zlib from the source, assume it is recent. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/zlib/extconf.rb12
1 files changed, 9 insertions, 3 deletions
diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb
index c3035e37b5..47a15b1b20 100644
--- a/ext/zlib/extconf.rb
+++ b/ext/zlib/extconf.rb
@@ -70,9 +70,15 @@ if have_zlib
$defs.concat(defines.collect{|d|' -D'+d})
- have_func('crc32_combine', 'zlib.h')
- have_func('adler32_combine', 'zlib.h')
- have_type('z_crc_t', 'zlib.h')
+ if zsrc
+ $defs << "-DHAVE_CRC32_COMBINE"
+ $defs << "-DHAVE_ADLER32_COMBINE"
+ $defs << "-DHAVE_TYPE_Z_CRC_T"
+ else
+ have_func('crc32_combine', 'zlib.h')
+ have_func('adler32_combine', 'zlib.h')
+ have_type('z_crc_t', 'zlib.h')
+ end
create_makefile('zlib') {|conf|
if zsrc