diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-18 19:51:58 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-18 19:51:58 +0000 |
commit | 54872dd7b3d33110812fe5ac8187baed5d4a164f (patch) | |
tree | 6b2dddcd8e307914c8a39722cff14ded98ef916a | |
parent | 5128c1732e38dea4aed204b06ad56c22cee30742 (diff) |
* ext/openssl/extconf.rb: Use Logging::message instead of message.
* ext/zlib/extconf.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/openssl/extconf.rb | 16 | ||||
-rw-r--r-- | ext/zlib/extconf.rb | 4 |
3 files changed, 15 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Sat May 19 04:46:53 2012 KOSAKI Motohiro <[email protected]> + + * ext/openssl/extconf.rb: Use Logging::message instead of message. + * ext/zlib/extconf.rb: ditto. + Fri May 18 18:13:44 2012 Nobuyoshi Nakada <[email protected]> * lib/mkmf.rb (MakeMakefile#configuration): keep space at end of diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index f0292e5078..a144dd2960 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -20,7 +20,7 @@ require_relative 'deprecation' dir_config("openssl") dir_config("kerberos") -message "=== OpenSSL for Ruby configurator ===\n" +Logging::message "=== OpenSSL for Ruby configurator ===\n" ## # Adds -DOSSL_DEBUG for compilation and some more targets when GCC is used @@ -30,12 +30,12 @@ if with_config("debug") or enable_config("debug") $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG" end -message "=== Checking for system dependent stuff... ===\n" +Logging::message "=== Checking for system dependent stuff... ===\n" have_library("nsl", "t_open") have_library("socket", "socket") have_header("assert.h") -message "=== Checking for required stuff... ===\n" +Logging::message "=== Checking for required stuff... ===\n" if $mingw have_library("wsock32") have_library("gdi32") @@ -48,8 +48,8 @@ unless result result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")} result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")} unless result - message "=== Checking for required stuff failed. ===\n" - message "Makefile wasn't created. Fix the errors above.\n" + Logging::message "=== Checking for required stuff failed. ===\n" + Logging::message "Makefile wasn't created. Fix the errors above.\n" exit 1 end end @@ -61,7 +61,7 @@ unless OpenSSL.check_func("SSL_library_init()", "openssl/ssl.h") raise "Ignore OpenSSL broken by Apple.\nPlease use another openssl. (e.g. using `configure --with-openssl-dir=/path/to/openssl')" end -message "=== Checking for OpenSSL features... ===\n" +Logging::message "=== Checking for OpenSSL features... ===\n" have_func("ERR_peek_last_error") have_func("ASN1_put_eoc") have_func("BN_mod_add") @@ -146,8 +146,8 @@ have_struct_member("EVP_CIPHER_CTX", "flags", "openssl/evp.h") have_struct_member("EVP_CIPHER_CTX", "engine", "openssl/evp.h") have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h") -message "=== Checking done. ===\n" +Logging::message "=== Checking done. ===\n" create_header create_makefile("openssl") -message "Done.\n" +Logging::message "Done.\n" diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb index d710226f9c..c49c29d463 100644 --- a/ext/zlib/extconf.rb +++ b/ext/zlib/extconf.rb @@ -15,7 +15,7 @@ if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and defines = [] - message 'checking for kind of operating system... ' + Logging::message 'checking for kind of operating system... ' os_code = with_config('os-code') || case RUBY_PLATFORM.split('-',2)[1] when 'amigaos' then @@ -50,7 +50,7 @@ if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and unless OS_NAMES.key? os_code then raise "invalid OS_CODE `#{os_code}'" end - message "#{OS_NAMES[os_code]}\n" + Logging::message "#{OS_NAMES[os_code]}\n" defines << "OS_CODE=#{os_code}" $defs.concat(defines.collect{|d|' -D'+d}) |