diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2015-03-13 19:08:27 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2015-03-13 19:08:27 +0300 |
| commit | 08e05a40422300a25e3b4e5b915592d7b2c41592 (patch) | |
| tree | eee4ee290240741157fa7909b1da71f3bab05fc7 | |
| parent | 83ba5ed2ecc1ca06971639e4e2c7325aaa8e5101 (diff) | |
| download | nginx-08e05a40422300a25e3b4e5b915592d7b2c41592.tar.gz nginx-08e05a40422300a25e3b4e5b915592d7b2c41592.tar.bz2 | |
Configure: removed obsolete threads bits.
| -rw-r--r-- | auto/lib/openssl/make | 5 | ||||
| -rw-r--r-- | auto/options | 3 | ||||
| -rw-r--r-- | auto/os/freebsd | 19 | ||||
| -rw-r--r-- | auto/summary | 25 |
4 files changed, 0 insertions, 52 deletions
diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make index e64acd973..765cd0653 100644 --- a/auto/lib/openssl/make +++ b/auto/lib/openssl/make @@ -41,11 +41,6 @@ END ;; *) - case $USE_THREADS in - NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;; - *) OPENSSL_OPT="$OPENSSL_OPT threads" ;; - esac - case $OPENSSL in /*) ngx_prefix="$OPENSSL/.openssl" ;; *) ngx_prefix="$PWD/$OPENSSL/.openssl" ;; diff --git a/auto/options b/auto/options index 0d296ac60..02affbdeb 100644 --- a/auto/options +++ b/auto/options @@ -190,9 +190,6 @@ do --without-poll_module) EVENT_POLL=NONE ;; --with-aio_module) EVENT_AIO=YES ;; - #--with-threads=*) USE_THREADS="$value" ;; - #--with-threads) USE_THREADS="pthreads" ;; - --with-file-aio) NGX_FILE_AIO=YES ;; --with-ipv6) NGX_IPV6=YES ;; diff --git a/auto/os/freebsd b/auto/os/freebsd index eee188915..6c696326b 100644 --- a/auto/os/freebsd +++ b/auto/os/freebsd @@ -99,25 +99,6 @@ then fi -if [ $USE_THREADS = "rfork" ]; then - - echo " + using rfork()" - -# # kqueue's EVFILT_SIGNAL is safe -# -# if [ $version -gt 460101 ]; then -# echo " + kqueue's EVFILT_SIGNAL is safe" -# have=NGX_HAVE_SAFE_EVFILT_SIGNAL . auto/have -# else -# echo "$0: error: the kqueue's EVFILT_SIGNAL is unsafe on this" -# echo "FreeBSD version, so --with-threads=rfork could not be used" -# echo -# -# exit 1 -# fi -fi - - if [ $EVENT_AIO = YES ]; then if [ \( $version -lt 500000 -a $version -ge 430000 \) \ -o $version -ge 500014 ] diff --git a/auto/summary b/auto/summary index dcebec9f0..b2009062d 100644 --- a/auto/summary +++ b/auto/summary @@ -3,35 +3,10 @@ # Copyright (C) Nginx, Inc. -### STUB - -if [ $USE_THREADS != NO ]; then - -cat << END - -$0: error: the threads support is broken now. - -END - exit 1 - fi - -### - - echo echo "Configuration summary" -#case $USE_THREADS in -# rfork) echo " + using rfork()ed threads" ;; -# pthreads) echo " + using libpthread threads library" ;; -# libthr) echo " + using FreeBSD libthr threads library" ;; -# libc_r) echo " + using FreeBSD libc_r threads library" ;; -# linuxthreads) echo " + using FreeBSD LinuxThreads port library" ;; -# NO) echo " + threads are not used" ;; -# *) echo " + using lib$USE_THREADS threads library" ;; -#esac - if [ $USE_PCRE = DISABLED ]; then echo " + PCRE library is disabled" |