nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-12 22:23:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.3' into maint-0.3.4

Browse Source
This commit is contained in:
Nick Mathewson 2018-08-15 12:20:57 -04:00
commit 571cb2f662
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug27081 Normal file
View File

@ -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.

6
configure.ac
View File

@ -575,8 +575,10 @@ if test "$LIBS" != "$saved_LIBS"; then
have_rt=yes have_rt=yes
fi fi
AC_SEARCH_LIBS(pthread_create, [pthread]) if test "$bwin32" = "false"; then
AC_SEARCH_LIBS(pthread_detach, [pthread]) AC_SEARCH_LIBS(pthread_create, [pthread])
AC_SEARCH_LIBS(pthread_detach, [pthread])
fi
AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true")
AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false")