From bb318692a6f6ce10428ad92d330164eacf414d23 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 5 Oct 2014 02:03:55 +0000 Subject: digest/*/extconf.rb: do not link openssl when using bundled * ext/digest/{md5,rmd160,sha1,sha2}/extconf.rb: configure OpenSSL only if bundled libraries is not used, so that OpenSSL is not linked unnecessarily. [ruby-core:65404] [Bug #10324] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/digest/sha2/extconf.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'ext/digest/sha2/extconf.rb') diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb index 5ab2d35af5..ac35132250 100644 --- a/ext/digest/sha2/extconf.rb +++ b/ext/digest/sha2/extconf.rb @@ -9,12 +9,11 @@ $INCFLAGS << " -I$(srcdir)/.." $objs = [ "sha2init.#{$OBJEXT}" ] -dir_config("openssl") -pkg_config("openssl") -require File.expand_path('../../../openssl/deprecation', __FILE__) - if !with_config("bundled-sha2") && - have_library("crypto") && + (dir_config("openssl") + pkg_config("openssl") + require File.expand_path('../../../openssl/deprecation', __FILE__) + have_library("crypto")) && %w[SHA256 SHA512].all? {|d| OpenSSL.check_func("#{d}_Transform", "openssl/sha.h")} && %w[SHA256 SHA512].all? {|d| have_type("#{d}_CTX", "openssl/sha.h")} $objs << "sha2ossl.#{$OBJEXT}" -- cgit v1.2.3