diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-21 14:47:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-21 14:47:16 -0500 |
| commit | 23fc1691b6dff4b0a3ad173809915901eb47fcab (patch) | |
| tree | 30e39346fb1fbd44ec4b5c71e4c8fbb53848c0b2 /configure.ac | |
| parent | f0415c16001ebfd06aec7a16bdf8677c7a931b65 (diff) | |
| parent | 84f5cb749d614deeb66f9032c54cd9885e300493 (diff) | |
| download | tor-23fc1691b6dff4b0a3ad173809915901eb47fcab.tar.gz tor-23fc1691b6dff4b0a3ad173809915901eb47fcab.zip | |
Merge branch 'better_workqueue_v3_squashed'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index efeea0658e..9aac1e8c55 100644 --- a/configure.ac +++ b/configure.ac @@ -400,6 +400,10 @@ fi AC_SEARCH_LIBS(pthread_create, [pthread]) AC_SEARCH_LIBS(pthread_detach, [pthread]) +AM_CONDITIONAL(THREADS_WIN32, test "$enable_threads" = "yes" && test "$bwin32" = "true") +AM_CONDITIONAL(THREADS_PTHREADS, test "$enable_threads" = "yes" && test "$bwin32" = "false") +AM_CONDITIONAL(THREADS_NONE, test "$enable_threads" != "yes") + dnl ------------------------------------------------------------------- dnl Check for functions before libevent, since libevent-1.2 apparently dnl exports strlcpy without defining it in a header. @@ -410,6 +414,7 @@ AC_CHECK_FUNCS( backtrace \ backtrace_symbols_fd \ clock_gettime \ + eventfd \ flock \ ftime \ getaddrinfo \ @@ -424,6 +429,8 @@ AC_CHECK_FUNCS( localtime_r \ lround \ memmem \ + pipe \ + pipe2 \ prctl \ rint \ sigaction \ @@ -437,7 +444,7 @@ AC_CHECK_FUNCS( sysconf \ sysctl \ uname \ - usleep \ + usleep \ vasprintf \ _vscprintf ) @@ -965,6 +972,7 @@ AC_CHECK_HEADERS( netinet/in6.h \ pwd.h \ stdint.h \ + sys/eventfd.h \ sys/file.h \ sys/ioctl.h \ sys/limits.h \ |