Mercurial > hg > nginx-vendor-0-6
diff auto/threads @ 6:80ba094c6b3e NGINX_0_1_3
nginx 0.1.3
*) Feature: the ngx_http_autoindex_module and the autoindex directive.
*) Feature: the proxy_set_x_url directive.
*) Bugfix: proxy module may get caught in an endless loop when sendfile
is not used.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 25 Oct 2004 00:00:00 +0400 |
parents | f0b350454894 |
children | 6f8b0dc0f8dd |
line wrap: on
line diff
--- a/auto/threads +++ b/auto/threads @@ -20,17 +20,16 @@ case $USE_THREADS in esac ;; - pthread) + pthreads) have=NGX_THREADS . auto/have CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS" CORE_LIBS="$CORE_LIBS -lpthread" ;; - freebsd4) + libthr) have=NGX_THREADS . auto/have - CFLAGS="$CFLAGS -pthread" CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS" - CORE_LIBS="$CORE_LIBS -pthread" + CORE_LIBS="$CORE_LIBS -lthr" ;; linuxthreads) @@ -42,22 +41,30 @@ case $USE_THREADS in CORE_LIBS="$CORE_LIBS -L /usr/local/lib -llthread -llgcc_r" ;; - lc_r) - have=NGX_THREADS . auto/have - CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS" - CORE_LIBS="$CORE_LIBS -lc_r" + libc_r) + case $PLATFORM in + FreeBSD:[34]*) + have=NGX_THREADS . auto/have + CFLAGS="$CFLAGS -pthread" + CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS" + CORE_LIBS="$CORE_LIBS -pthread" + ;; + + FreeBSD:5*) + have=NGX_THREADS . auto/have + CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS" + CORE_LIBS="$CORE_LIBS -lc_r" + ;; + esac ;; - lthr) + NO) + ;; + + *) have=NGX_THREADS . auto/have CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS" - CORE_LIBS="$CORE_LIBS -lthr" - ;; - - lkse) - have=NGX_THREADS . auto/have - CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS" - CORE_LIBS="$CORE_LIBS -lkse" + CORE_LIBS="$CORE_LIBS -l$USE_THREADS" ;; esac