summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-28 09:55:12 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-28 09:55:12 +0000
commit85efe85ffab83ac97fc60ee7a51095923c7eab5d (patch)
treebeb414eede513987a9ee284e9cda55afc3e53d6f
parent40a385561dd3075be5701d58cda5a9fdbc391add (diff)
downloadruby-85efe85ffab83ac97fc60ee7a51095923c7eab5d.tar.gz
ruby-85efe85ffab83ac97fc60ee7a51095923c7eab5d.tar.xz
ruby-85efe85ffab83ac97fc60ee7a51095923c7eab5d.zip
* ext/openssl/extconf.rb: check again after pkg-config for MinGW on
Cygwin. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/openssl/extconf.rb4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 18dc6b874..ff8fa5f0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 28 18:53:03 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/openssl/extconf.rb: check again after pkg-config for MinGW on
+ Cygwin.
+
Mon Jul 28 15:32:04 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/stringio/stringio.c (strio_gets): only "gets" should set $_.
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index fe4d2d654..632f0dac4 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -79,7 +79,9 @@ if !result
$CFLAGS += " " << `#{pkgconfig} --cflags openssl`.chomp
$DLDFLAGS += " " << `#{pkgconfig} --libs-only-L openssl`.chomp
$LIBS += " " << `#{pkgconfig} --libs-only-l openssl`.chomp
- else
+ result = have_header("openssl/ssl.h")
+ end
+ if !result
message "=== Checking for required stuff failed. ===\n"
message "Makefile wasn't created. Fix the errors above.\n"
exit 1