diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 11:55:20 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 11:55:20 +0000 |
| commit | 400683ac9102ee18564bb6eff0037e710fb48d9f (patch) | |
| tree | 5dccb1c311036c2412f0587c13b47fc7d4149831 /misc | |
| parent | a16387eba9b14d48be0e0644f6030f880b652836 (diff) | |
| download | nginx-400683ac9102ee18564bb6eff0037e710fb48d9f.tar.gz nginx-400683ac9102ee18564bb6eff0037e710fb48d9f.tar.bz2 | |
merge r3489, r3493:
*) MSVC8 compatibility with OpenSSL 1.0.0
*) fix building OpenSSL-1.0.0 on 64-bit Linux:
make installs the libraries in lib64 directory
and build nginx/Windows against OpenSSL-0.9.8n
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/GNUmakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/GNUmakefile b/misc/GNUmakefile index eed4afa99..4e5ff26ff 100644 --- a/misc/GNUmakefile +++ b/misc/GNUmakefile @@ -5,7 +5,7 @@ NGINX = nginx-$(VER) TEMP = tmp OBJS = objs.msvc8 -OPENSSL = openssl-0.9.8k +OPENSSL = openssl-0.9.8n ZLIB = zlib-1.2.3 PCRE = pcre-7.9 |