[tor-commits] [tor/maint-0.3.2] Include ws2_32 when trying to link openssl on windows in autoconf

[nickm@xxxxxxxxxxxxxx]

commit 1bf36c18374cdf97d52e0b3382a80457973514d0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 20 13:37:22 2017 -0500

    Include ws2_32 when trying to link openssl on windows in autoconf
    
    Fixes bug 23783; bugfix on 0.3.2.2-alpha when we started looking for
    TLSv1_1_method().
---
 changes/bug23783 | 5 +++++
 configure.ac     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug23783 b/changes/bug23783
new file mode 100644
index 000000000..98c583a12
--- /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 677470081..2ce16ff12 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();], [],



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits