diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-20 14:25:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-20 14:25:17 -0500 |
| commit | 9068e55ce8c11c6500b44347fb9159bb5a8ef8bf (patch) | |
| tree | 462077e64ce5096346ad4e55eb752155348c5191 | |
| parent | 729f9a286c05b990327b6fdcb367c89c72ab57aa (diff) | |
| parent | e2d8300c1060050dad9092e211c6753376b87ad6 (diff) | |
| download | tor-9068e55ce8c11c6500b44347fb9159bb5a8ef8bf.tar.gz tor-9068e55ce8c11c6500b44347fb9159bb5a8ef8bf.zip | |
Merge branch 'maint-0.3.2'
| -rw-r--r-- | changes/bug23783 | 5 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug23783 b/changes/bug23783 new file mode 100644 index 0000000000..98c583a12b --- /dev/null +++ b/changes/bug23783 @@ -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. + diff --git a/configure.ac b/configure.ac index 6b0e04e7fc..490d944630 100644 --- a/configure.ac +++ b/configure.ac @@ -725,7 +725,7 @@ AC_ARG_WITH(ssl-dir, ]) 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>], [struct ssl_method_st; const struct ssl_method_st *TLSv1_1_method(void);], [TLSv1_1_method();], [], |