diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-02 14:45:28 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-02 14:45:28 +0000 |
| commit | 8032b00f8e43be6e34f93005a17e26bc6d89f1c1 (patch) | |
| tree | d208fd9de9594d4db51d1b39ee8546476c599821 | |
| parent | 6a792d0b735ea7a83e22e30da57a9fe8e0097b7e (diff) | |
openssl: search winsock
* ext/openssl/extconf.rb: on Windows search winsock library
always, regardless pkg-config. direct use of winsock is not
region of OpenSSL. [ruby-core:85895] [Bug #14568]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/openssl/extconf.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 8a8a81b9c7..658a08ca13 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -33,6 +33,9 @@ end Logging::message "=== Checking for system dependent stuff... ===\n" have_library("nsl", "t_open") have_library("socket", "socket") +if $mswin || $mingw + have_library("ws2_32") +end Logging::message "=== Checking for required stuff... ===\n" result = pkg_config("openssl") && have_header("openssl/ssl.h") @@ -40,7 +43,6 @@ result = pkg_config("openssl") && have_header("openssl/ssl.h") def find_openssl_library if $mswin || $mingw # required for static OpenSSL libraries - have_library("ws2_32") have_library("gdi32") # OpenSSL <= 1.0.2 (for RAND_screen()) have_library("crypt32") end |