diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2022-09-08 20:47:12 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2022-09-08 20:47:12 +0900 |
| commit | afa4078a53fda554a3efeef13756398c5de7a5bd (patch) | |
| tree | e9dcdac3101d5a2c8ee971d5f5998d6c22c92311 /ext/openssl | |
| parent | 459a0e26a92608547485025ba702f65cd222b881 (diff) | |
| parent | 5316241e6153375bef67ef8ea73469bc185530e4 (diff) | |
| download | ruby-openssl-afa4078a53fda554a3efeef13756398c5de7a5bd.tar.gz | |
Merge branch 'maint-2.1' into maint-2.2
* maint-2.1:
Ruby/OpenSSL 2.1.4
Make GitHub Actions happy on 2.1/2.2 branches
ignore pkgconfig when any openssl option is specified
Diffstat (limited to 'ext/openssl')
| -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 e13595c7..0dc1a5eb 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" |