diff options
author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-10 17:24:30 +0000 |
---|---|---|
committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-10 17:24:30 +0000 |
commit | f6b49243eb0c21bea1c4198cdd52a549e6ead075 (patch) | |
tree | aefa0a333fedf70502926189536085ddec49b124 /ext | |
parent | e14a0042d25173f699042a3259cb32edcfc32bd9 (diff) | |
download | ruby-f6b49243eb0c21bea1c4198cdd52a549e6ead075.tar.gz |
* ext/openssl/extconf.rb: try pkgconfig first, then fall back to
normal have_library, etc. Thanks Erik Hollensbe. [ruby-core:32406]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/openssl/extconf.rb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 8102241ca8..b1f2d88dda 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -43,11 +43,14 @@ if $mingw have_library("wsock32") have_library("gdi32") end -result = have_header("openssl/ssl.h") -result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")} -result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")} -if !result - unless pkg_config("openssl") and have_header("openssl/ssl.h") + +result = pkg_config("openssl") && have_header("openssl/ssl.h") + +unless result + result = have_header("openssl/ssl.h") + result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")} + result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")} + unless result message "=== Checking for required stuff failed. ===\n" message "Makefile wasn't created. Fix the errors above.\n" exit 1 |