diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2022-09-08 23:02:44 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-09-20 18:47:08 +0900 |
| commit | d28d0ef2a6caafb5f661b0187c9f935cba84dccb (patch) | |
| tree | 606a79ac7fbfdbd1c3e539ff270aa2860bb4c6f6 /ext/openssl/extconf.rb | |
| parent | 6b099328af2ae2d04cbfd06fedc36a19cdecd30d (diff) | |
| download | ruby-d28d0ef2a6caafb5f661b0187c9f935cba84dccb.tar.gz | |
Merge openssl-2.1.4ky/ruby_2_7-openssl-2.1.4
The changes can be found at:
https://github.com/ruby/openssl/compare/v2.1.3...v2.1.4
Diffstat (limited to 'ext/openssl/extconf.rb')
| -rw-r--r-- | ext/openssl/extconf.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 7e817ae2da..f4212bd450 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -14,7 +14,7 @@ require "mkmf" require File.expand_path('../deprecation', __FILE__) -dir_config("openssl") +dir_config_given = dir_config("openssl").any? dir_config("kerberos") Logging::message "=== OpenSSL for Ruby configurator ===\n" @@ -88,7 +88,7 @@ def find_openssl_library end Logging::message "=== Checking for required stuff... ===\n" -pkg_config_found = pkg_config("openssl") && have_header("openssl/ssl.h") +pkg_config_found = !dir_config_given && pkg_config("openssl") && have_header("openssl/ssl.h") if !pkg_config_found && !find_openssl_library Logging::message "=== Checking for required stuff failed. ===\n" |