aboutsummaryrefslogtreecommitdiff
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
commit571cb2f662f1c39eb1069c12164a3dc202afb362 (patch)
tree13436570479324e6a55a8bec510eff717a8d4270 /configure.ac
parent6c1d2549df546b6d2628582c9b078753eecd16f4 (diff)
parent0fc171a47be0cb3b1021816ab80ef823063ce2d1 (diff)
downloadtor-571cb2f662f1c39eb1069c12164a3dc202afb362.tar.gz
tor-571cb2f662f1c39eb1069c12164a3dc202afb362.zip
Merge branch 'maint-0.3.3' into maint-0.3.4
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 ae5c8a83cf..2d1390baef 100644
--- 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")