diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-15 12:20:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-15 12:20:57 -0400 |
| commit | fea5c6d791973a524f2bc7fe39b4f62ffd98f413 (patch) | |
| tree | 89f0bc030da8d5093fffab4b4b73c608e08cd89d | |
| parent | fe4c08bb158a3146cb6346b55dc2f94e6728e0fa (diff) | |
| parent | 4c355ff18544783a5a283f7660bcdca6cf93062b (diff) | |
| download | tor-fea5c6d791973a524f2bc7fe39b4f62ffd98f413.tar.gz tor-fea5c6d791973a524f2bc7fe39b4f62ffd98f413.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -rw-r--r-- | changes/bug27081 | 4 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/changes/bug27081 b/changes/bug27081 new file mode 100644 index 0000000000..74e0efbd29 --- /dev/null +++ b/changes/bug27081 @@ -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. diff --git a/configure.ac b/configure.ac index f3164640cd..f66abbbdee 100644 --- a/configure.ac +++ b/configure.ac @@ -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") |