Skip to content
Snippets Groups Projects
Commit 571cb2f6 authored by Nick Mathewson's avatar Nick Mathewson :game_die:
Browse files

Merge branch 'maint-0.3.3' into maint-0.3.4

parents 6c1d2549 0fc171a4
Branches
Tags
No related merge requests found
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.
......@@ -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")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment