From 8fa21c9aec5867d99016a1f6897b8f82f032e04a Mon Sep 17 00:00:00 2001 From: Michal Rokos Date: Wed, 23 Jul 2003 17:22:03 +0000 Subject: Pretty print --- ChangeLog | 6 ++++++ extconf.rb | 21 +++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7606e03..3a06ed3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed, 23 Jul 2003 19:20:52 +0200 -- Michal Rokos + * extconf.rb: Make output more pretty (just to keep official Ruby version in sync...) + +Wed, 23 Jul 2003 19:20:09 +0200 -- Michal Rokos + * OpenSSL was imported to Ruby src tree (by Gotou) + Tue, 22 Jul 2003 11:05:00 +0200 -- Michal Rokos * ossl_pkey_rsa.c: Remove not-used code * ossl_x509name.c: ditto. diff --git a/extconf.rb b/extconf.rb index 0b028b7..3913e3f 100644 --- a/extconf.rb +++ b/extconf.rb @@ -73,15 +73,16 @@ EOD end -def have_openssl_097(inc_dir) -# FIXME: -# checking_for("OpenSSL >= 0.9.7") do - printf "checking for OpenSSL version... " - File.open(inc_dir+"/openssl/opensslv.h") {|f| - txt = f.read - puts (txt.grep(/#define SHLIB_VERSION_NUMBER/)[0].split '"')[1] - true - } +def check_openssl(inc_dir) + f = File::basename(__FILE__) + ": " + m = "checking OpenSSL version... " + message "%s", m + Logging::message "%s%s--------------------\n", f, m + txt = File.read(inc_dir+"/openssl/opensslv.h") + r = (txt.grep(/#define SHLIB_VERSION_NUMBER/)[0].split '"')[1] + message a = "#{r}\n" + Logging::message "-------------------- %s\n", a + r end message "=== Checking for required stuff... ===\n" @@ -101,7 +102,7 @@ have_header("unistd.h") have_header("sys/time.h") message "=== Checking for OpenSSL features... ===\n" -have_openssl_097(includes) +check_openssl(includes) have_func("HMAC_CTX_copy") have_func("X509_STORE_get_ex_data") have_func("X509_STORE_set_ex_data") -- cgit v1.2.3