1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/openssl/extconf.rb: try pkgconfig first, then fall back to

Browse Source 
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
This commit is contained in:
tenderlove 2010-12-10 17:24:30 +00:00
parent e14a0042d2
commit f6b49243eb
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Dec 11 02:23:15 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/openssl/extconf.rb: try pkgconfig first, then fall back to
normal have_library, etc. Thanks Erik Hollensbe. [ruby-core:32406]
Fri Dec 10 22:33:39 2010 Tanaka Akira <akr@fsij.org>
* dln_find.c: parenthesize macro arguments.

13
ext/openssl/extconf.rb
View File

@ -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