diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-07-24 06:56:02 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-07-24 06:56:02 +0000 |
| commit | c1008ab51b5a01f541136a5920f665a7edd10205 (patch) | |
| tree | ef6692f5c5eea2b21fe0cc039434260082ef6bb4 /ext/openssl/extconf.rb | |
| parent | e02b469de182c1d87ead38fa82630eaaee75c379 (diff) | |
* ext/openssl/extconf.rb: add check for win32 OpenSSL libraries.
* ext/openssl/extconf.rb: add check for __VA_AEGS__.
* ext/openssl/ossl.h: avoid non C99 compiler errors.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/extconf.rb')
| -rw-r--r-- | ext/openssl/extconf.rb | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 8ebe3e7f1c..2335fc680d 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -18,14 +18,6 @@ require "mkmf" dir_config("openssl") -if RUBY_PLATFORM =~ /mswin32/ - CRYPTOLIB="libeay32" - SSLLIB="ssleay32" -else - CRYPTOLIB="crypto" - SSLLIB="ssl" -end - if !defined? message def message(*s) printf(*s) @@ -76,9 +68,10 @@ end message "=== Checking for required stuff... ===\n" result = have_header("openssl/crypto.h") -result &= have_library(CRYPTOLIB, "OpenSSL_add_all_digests") -result &= have_library(SSLLIB, "SSL_library_init") - +result &= ( have_library("crypto", "OpenSSL_add_all_digests") || + have_library("libeay32", "OpenSSL_add_all_digests") ) +result &= ( have_library("ssl", "SSL_library_init") || + have_library("ssleay32", "SSL_library_init") ) if !result message "=== Checking for required stuff failed. ===\n" message "Makefile wasn't created. Fix the errors above.\n" @@ -109,6 +102,9 @@ have_func("BN_mod_sqr") have_func("BN_mod_add") have_func("BN_mod_sub") have_func("CONF_get1_default_config_file") +if try_cpp("#define FOO(a, ...) foo(a, ##__VA_ARGS__)\n") + $defs.push("-DHAVE_VA_ARGS_MACRO") +end have_header("openssl/ocsp.h") have_struct_member("EVP_CIPHER_CTX", "flags", "openssl/evp.h") |