diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2015-02-09 09:09:00 +0100 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2015-02-09 10:36:59 +0100 |
| commit | 353d2fe7e144dee5fbc9b4d6e47ada4edeba59cd (patch) | |
| tree | 79c2563b599acec52dc123c2be5fb55696c8e9cc /configure.ac | |
| parent | 37d16c3cc78151daf2cbebd643ea4d64b504989e (diff) | |
| download | tor-353d2fe7e144dee5fbc9b4d6e47ada4edeba59cd.tar.gz tor-353d2fe7e144dee5fbc9b4d6e47ada4edeba59cd.zip | |
Re-remove the --disable-threads configure option
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index af16edfe49..8daddf03c6 100644 --- a/configure.ac +++ b/configure.ac @@ -156,22 +156,6 @@ if test x$enable_systemd = xyes -a x$have_systemd != xyes ; then AC_MSG_ERROR([Explicitly requested systemd support, but systemd not found]) fi -AC_ARG_ENABLE(threads, - AS_HELP_STRING(--disable-threads, disable multi-threading support)) - -if test x$enable_threads = x; then - case $host in - *-*-solaris* ) - # Don't try multithreading on solaris -- cpuworkers seem to lock. - AC_MSG_NOTICE([You are running Solaris; Sometimes threading makes -cpu workers lock up here, so I will disable threads.]) - enable_threads="no";; - *) - enable_threads="yes";; - esac -fi - - case $host in *-*-solaris* ) AC_DEFINE(_REENTRANT, 1, [Define on some platforms to activate x_r() functions in time.h]) @@ -400,9 +384,8 @@ 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") +AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") +AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false") dnl ------------------------------------------------------------------- dnl Check for functions before libevent, since libevent-1.2 apparently |