Merge branch 'maint-0.3.2' into release-0.3.2
This commit is contained in:
commit
e343cb8f63
|
@ -0,0 +1,5 @@
|
||||||
|
o Minor bugfixes (compilation, windows):
|
||||||
|
- When detecting OpenSSL on Windows from our configure script, make sure
|
||||||
|
to try linking with the ws2_32 library. Fixes bug 23783; bugfix on
|
||||||
|
0.3.2.2-alpha.
|
||||||
|
|
|
@ -724,7 +724,7 @@ AC_ARG_WITH(ssl-dir,
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1])
|
AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1])
|
||||||
TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI],
|
TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32],
|
||||||
[#include <openssl/ssl.h>],
|
[#include <openssl/ssl.h>],
|
||||||
[struct ssl_method_st; const struct ssl_method_st *TLSv1_1_method(void);],
|
[struct ssl_method_st; const struct ssl_method_st *TLSv1_1_method(void);],
|
||||||
[TLSv1_1_method();], [],
|
[TLSv1_1_method();], [],
|
||||||
|
|
Loading…
Reference in New Issue