mirror of
https://github.com/ruby/ruby.git
synced 2025-08-23 21:14:23 +02:00
[ruby/openssl] ignore pkgconfig when any openssl option is specified
b23fa75aa3
This commit is contained in:
parent
01025a0055
commit
0bf2dfa6ac
1 changed files with 2 additions and 2 deletions
|
@ -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"
|
||||
|
@ -92,7 +92,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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue