tenderlove	2010-12-11 02:24:30 +0900 (Sat, 11 Dec 2010)

  New Revision: 30167

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30167

  Log:
    * ext/openssl/extconf.rb: try pkgconfig first, then fall back to
      normal have_library, etc.  Thanks Erik Hollensbe. [ruby-core:32406]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30166)
+++ ChangeLog	(revision 30167)
@@ -1,3 +1,8 @@
+Sat Dec 11 02:23:15 2010  Aaron Patterson <aaron@t...>
+
+	* 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@f...>
 
 	* dln_find.c: parenthesize macro arguments.
Index: ext/openssl/extconf.rb
===================================================================
--- ext/openssl/extconf.rb	(revision 30166)
+++ ext/openssl/extconf.rb	(revision 30167)
@@ -43,11 +43,14 @@
   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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/