Commit 4c355ff1 authored by Nick Mathewson's avatar Nick Mathewson 🎨
Browse files

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

parents fe19b40f 7a570b81
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.
......@@ -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")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment