tor

commit 4c355ff18544783a5a283f7660bcdca6cf93062b
parent fe19b40fe9e2f78caf6f58bb3cc627a6fbb0e2c5
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 15 Aug 2018 12:20:53 -0400

Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9

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
@@ -370,8 +370,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")