diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-05 02:03:55 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-05 02:03:55 +0000 |
| commit | bb318692a6f6ce10428ad92d330164eacf414d23 (patch) | |
| tree | 11dfbf2b7826a947f0f21b2a655273c0aabf91a8 /ext/digest/md5/extconf.rb | |
| parent | 38dbbf33b03256df3c290a89254e898ee3ffd3dc (diff) | |
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
Diffstat (limited to 'ext/digest/md5/extconf.rb')
| -rw-r--r-- | ext/digest/md5/extconf.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb index 5a57fd3eea..dbef0878ca 100644 --- a/ext/digest/md5/extconf.rb +++ b/ext/digest/md5/extconf.rb @@ -9,14 +9,13 @@ $INCFLAGS << " -I$(srcdir)/.." $objs = [ "md5init.#{$OBJEXT}" ] -dir_config("openssl") -pkg_config("openssl") -require File.expand_path('../../../openssl/deprecation', __FILE__) - if !with_config("bundled-md5") && - have_library("crypto") && OpenSSL.check_func("MD5_Transform", "openssl/md5.h") + (dir_config("openssl") + pkg_config("openssl") + require File.expand_path('../../../openssl/deprecation', __FILE__) + have_library("crypto")) && + OpenSSL.check_func("MD5_Transform", "openssl/md5.h") $objs << "md5ossl.#{$OBJEXT}" - else $objs << "md5.#{$OBJEXT}" end |