mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Configure: removed obsolete threads bits.

Browse Source
This commit is contained in:
Ruslan Ermilov 2015-03-13 19:08:27 +03:00
parent 83ba5ed2ec
commit 08e05a4042
4 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
auto/lib/openssl/make
View File

@ -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 case $OPENSSL in
/*) ngx_prefix="$OPENSSL/.openssl" ;; /*) ngx_prefix="$OPENSSL/.openssl" ;;
*) ngx_prefix="$PWD/$OPENSSL/.openssl" ;; *) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;

3
auto/options
View File

@ -190,9 +190,6 @@ do
--without-poll_module) EVENT_POLL=NONE ;; --without-poll_module) EVENT_POLL=NONE ;;
--with-aio_module) EVENT_AIO=YES ;; --with-aio_module) EVENT_AIO=YES ;;
#--with-threads=*) USE_THREADS="$value" ;;
#--with-threads) USE_THREADS="pthreads" ;;
--with-file-aio) NGX_FILE_AIO=YES ;; --with-file-aio) NGX_FILE_AIO=YES ;;
--with-ipv6) NGX_IPV6=YES ;; --with-ipv6) NGX_IPV6=YES ;;

19
auto/os/freebsd
View File

@ -99,25 +99,6 @@ then
fi 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 [ $EVENT_AIO = YES ]; then
if [ \( $version -lt 500000 -a $version -ge 430000 \) \ if [ \( $version -lt 500000 -a $version -ge 430000 \) \
-o $version -ge 500014 ] -o $version -ge 500014 ]

25
auto/summary
View File

@ -3,35 +3,10 @@
# Copyright (C) Nginx, Inc. # 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
echo "Configuration summary" 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 if [ $USE_PCRE = DISABLED ]; then
echo " + PCRE library is disabled" echo " + PCRE library is disabled"