Skip to content

Commit b23fa75

Browse files
committed
ignore pkgconfig when any openssl option is specified
1 parent e8ee01b commit b23fa75

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/openssl/extconf.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
require "mkmf"
1515
require File.expand_path('../deprecation', __FILE__)
1616

17-
dir_config("openssl")
17+
dir_config_given = dir_config("openssl").any?
1818
dir_config("kerberos")
1919

2020
Logging::message "=== OpenSSL for Ruby configurator ===\n"
@@ -88,7 +88,7 @@ def find_openssl_library
8888
end
8989

9090
Logging::message "=== Checking for required stuff... ===\n"
91-
pkg_config_found = pkg_config("openssl") && have_header("openssl/ssl.h")
91+
pkg_config_found = !dir_config_given && pkg_config("openssl") && have_header("openssl/ssl.h")
9292

9393
if !pkg_config_found && !find_openssl_library
9494
Logging::message "=== Checking for required stuff failed. ===\n"

0 commit comments

Comments
 (0)