mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-27 13:53:31 +01:00
Merge branch 'maint-0.3.4'
This commit is contained in:
commit
34083f00ab
4
changes/bug27081
Normal file
4
changes/bug27081
Normal 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.
|
@ -563,8 +563,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")
|
||||
|
Loading…
Reference in New Issue
Block a user