diff options
author | Stefan Kaes <stefan.kaes@xing.com> | 2022-01-04 13:28:26 +0100 |
---|---|---|
committer | Stefan Kaes <stefan.kaes@xing.com> | 2022-01-11 15:53:11 +0100 |
commit | b23fa75aa3a514e83e40d5220339f992f947befd (patch) | |
tree | 57ef6deabef14f37cc4f537a23761ccc1345e179 /ext/openssl | |
parent | e8ee01b22c3e26525c70ae9dbbbb03c591bc5794 (diff) | |
download | ruby-openssl-b23fa75aa3a514e83e40d5220339f992f947befd.tar.gz |
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 7e817ae2..f4212bd4 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" |