From a7fee652cda225ce788b2d41ec251d8e3c15b713 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 2 Aug 2003 05:54:00 +0000 Subject: * lib/mkmf.rb (pkg_config): get configuration by pkg-config. [new] * ext/openssl/extconf.rb: use pkg_config. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/extconf.rb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'ext') diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 76befa5a5..92dabdc58 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -18,7 +18,6 @@ require "mkmf" dir_config("openssl") dir_config("kerberos") -pkgconfig = with_config("pkg-config", !CROSS_COMPILING && "pkg-config") message "=== OpenSSL for Ruby configurator ===\n" @@ -51,13 +50,7 @@ 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 - if find_executable(pkgconfig) and system(pkgconfig, "--exists", "openssl") - $CFLAGS += " " << `#{pkgconfig} --cflags openssl`.chomp - $DLDFLAGS += " " << `#{pkgconfig} --libs-only-L openssl`.chomp - $LIBS += " " << `#{pkgconfig} --libs-only-l openssl`.chomp - result = have_header("openssl/ssl.h") - end - if !result + unless pkg_config("openssl") and have_header("openssl/ssl.h") message "=== Checking for required stuff failed. ===\n" message "Makefile wasn't created. Fix the errors above.\n" exit 1 -- cgit