summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-20 14:25:17 -0500
committerNick Mathewson <nickm@torproject.org>2017-11-20 14:25:17 -0500
commite343cb8f631dbbad2fbe9814d558ac06bc46a8e8 (patch)
treea0a1ff00f75adaf03c18d2fd5fb8eef4315ff0c6
parent1bd83c2ec846764a52f4fd001662f7fb1a1a43f8 (diff)
parente2d8300c1060050dad9092e211c6753376b87ad6 (diff)
downloadtor-e343cb8f631dbbad2fbe9814d558ac06bc46a8e8.tar.gz
tor-e343cb8f631dbbad2fbe9814d558ac06bc46a8e8.zip
Merge branch 'maint-0.3.2' into release-0.3.2
-rw-r--r--changes/bug237835
-rw-r--r--configure.ac2
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 6774700810..2ce16ff129 100644
--- a/configure.ac
+++ b/configure.ac
@@ -724,7 +724,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();], [],