Commit 0fc171a4 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.3.2' into maint-0.3.3

parents 1868982d a26a2735

changes/bug27081

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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.

configure.ac

+4 −2
Original line number Diff line number Diff line
@@ -515,8 +515,10 @@ if test "$LIBS" != "$saved_LIBS"; then 
   have_rt=yes

fi



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")