summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-08-15 12:20:57 -0400
committerNick Mathewson <nickm@torproject.org>2018-08-15 12:20:57 -0400
commita26a2735b9cf9c6940d784f755f983088c333833 (patch)
tree43d2f2403de6a2a1878a7157a1144e205445d8e8 /configure.ac
parent8982719f6ac06383c26283b60acf6b3d3fde613e (diff)
parent4c355ff18544783a5a283f7660bcdca6cf93062b (diff)
downloadtor-a26a2735b9cf9c6940d784f755f983088c333833.tar.gz
tor-a26a2735b9cf9c6940d784f755f983088c333833.zip
Merge branch 'maint-0.2.9' into maint-0.3.2
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 1aa03c2ee9..91abe7e1e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -487,8 +487,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")