]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Include ws2_32 when trying to link openssl on windows in autoconf
authorNick Mathewson <nickm@torproject.org>
Mon, 20 Nov 2017 18:37:22 +0000 (13:37 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 20 Nov 2017 18:37:22 +0000 (13:37 -0500)
Fixes bug 23783; bugfix on 0.3.2.2-alpha when we started looking for
TLSv1_1_method().

changes/bug23783 [new file with mode: 0644]
configure.ac

diff --git a/changes/bug23783 b/changes/bug23783
new file mode 100644 (file)
index 0000000..98c583a
--- /dev/null
@@ -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.
+
index 6774700810978184e2d1406df7a413e0a8c2d314..2ce16ff129a0be2c2b0c4563b2899e2cccc714f4 100644 (file)
@@ -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();], [],