summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriwamatsu <iwamatsu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-04-25 21:45:33 +0000
committeriwamatsu <iwamatsu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-04-25 21:45:33 +0000
commit73868a547f60849833fde5de6a2b5d780a0845e0 (patch)
tree220ac627898dc0c8fec11e0254c648e5ac3c76bd
parent333e43e06be3db1beddac9096f02bfe2e0f34bd7 (diff)
* ext/openssl/extconf.rb: Should check SSLv2_*method.
openssl compiled with "no-ssl2" the extconf don't fail when running `make' having this compilation errors. Patched by Laurent Arnoud. fixes #4562, #4556 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/openssl/extconf.rb3
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c45ad99fe0..c4c53401ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Apr 25 21:31:36 2011 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+
+ * ext/openssl/extconf.rb: Should check SSLv2_*method.
+ openssl compiled with "no-ssl2" the extconf don't fail
+ when running `make' having this compilation errors.
+ Patched by Laurent Arnoud. fixes #4562, #4556
+
Mon Apr 25 20:53:32 2011 Tajima, Akio <artonx@yahoo.co.jp>
* win32/win32.c (kill): accept 0 only sig is SIGINT #4596
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index b1f2d88dda..1bd5a0741c 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -100,6 +100,9 @@ have_func("OBJ_NAME_do_all_sorted")
have_func("SSL_SESSION_get_id")
have_func("SSL_SESSION_cmp")
have_func("OPENSSL_cleanse")
+have_func("SSLv2_method")
+have_func("SSLv2_server_method")
+have_func("SSLv2_client_method")
unless have_func("SSL_set_tlsext_host_name", ['openssl/ssl.h'])
have_macro("SSL_set_tlsext_host_name", ['openssl/ssl.h']) && $defs.push("-DHAVE_SSL_SET_TLSEXT_HOST_NAME")
end