diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2022-09-08 23:00:01 +0900 |
|---|---|---|
| committer | usa <usa@garbagecollect.jp> | 2022-11-24 20:04:56 +0900 |
| commit | ba5cf0f7c52d4d35cc6a173c89eda98ceffa2dcf (patch) | |
| tree | c2a319372cc6f1d7316d11e1263b73e461556465 /ext/openssl/extconf.rb | |
| parent | 5fb3cf463c2d78a161fba6a4486bd48e0cbd96c9 (diff) | |
Merge openssl-2.2.2v3_0_5
The changes can be found at:
https://github.com/ruby/openssl/compare/v2.2.1...v2.2.2
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 e13595c7c7..0dc1a5eb43 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -13,7 +13,7 @@ require "mkmf" -dir_config("openssl") +dir_config_given = dir_config("openssl").any? dir_config("kerberos") Logging::message "=== OpenSSL for Ruby configurator ===\n" @@ -90,7 +90,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" |