Configure: removed obsolete threads bits.

diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make
index e64acd973ecfa21bbd98e919e051b33fef045fc6..765cd065371befce1bf0511eba6470d2aa0fc99e 100644 (file)
--- 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 0d296ac60277c2b9ab2d7ae499a2f86535a65b9b..02affbdeb9d74e2c90e917f030cda6266f76cb8c 100644 (file)
--- 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 eee188915179f5fb2f20697fa24acc64582a9b0d..6c696326b0dedd5f102b3ad1a42009f8e08893dc 100644 (file)
--- 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 dcebec9f0fef80e8c61fe88f869ab204ba28ed45..b2009062dfaf926b06c75b5c1f621745500d6143 100644 (file)
--- 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"