tor

commit 571cb2f662f1c39eb1069c12164a3dc202afb362
parent 6c1d2549df546b6d2628582c9b078753eecd16f4
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 15 Aug 2018 12:20:57 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

Diffstat:
A
changes/bug27081
 | 
4
++++
M
configure.ac
 | 
6
++++--

2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/changes/bug27081 b/changes/bug27081
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation, windows):
+    - Don't link or search for pthreads when building for Windows, even if we
+      are using build environment (like mingw) that provides a pthreads
+      library. Fixes bug 27081; bugfix on 0.1.0.1-rc.
diff --git a/configure.ac b/configure.ac
@@ -575,8 +575,10 @@ if test "$LIBS" != "$saved_LIBS"; then
    have_rt=yes
 fi
 
-AC_SEARCH_LIBS(pthread_create, [pthread])
-AC_SEARCH_LIBS(pthread_detach, [pthread])
+if test "$bwin32" = "false"; then
+  AC_SEARCH_LIBS(pthread_create, [pthread])
+  AC_SEARCH_LIBS(pthread_detach, [pthread])
+fi
 
 AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true")
 AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false")