diff --git a/auto/configure b/auto/configure index 8ef3a9aca..4a67088ba 100755 --- a/auto/configure +++ b/auto/configure @@ -52,7 +52,6 @@ fi if [ "$NGX_PLATFORM" != win32 ]; then . auto/os/features - . auto/threads . auto/unix fi diff --git a/auto/threads b/auto/threads deleted file mode 100644 index 29bc72476..000000000 --- a/auto/threads +++ /dev/null @@ -1,70 +0,0 @@ - -# Copyright (C) Igor Sysoev - - -case $USE_THREADS in - rfork) - have=NGX_THREADS . auto/have - have=NGX_USE_RFORK . auto/have - CORE_DEPS="$CORE_DEPS $FREEBSD_RFORK_DEPS" - CORE_SRCS="$CORE_SRCS $FREEBSD_RFORK_SRCS" - - case "$NGX_PLATFORM" in - *:i386) - if [ \( $version -gt 500000 -a $version -lt 501000 \) \ - -o $version -lt 491000 ] - then - CORE_SRCS="$CORE_SRCS $FREEBSD_RFORK_THREAD_SRCS" - fi - ;; - esac - ;; - - pthreads) - have=NGX_THREADS . auto/have - CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS" - CORE_LIBS="$CORE_LIBS -lpthread" - ;; - - libthr) - have=NGX_THREADS . auto/have - CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS" - CORE_LIBS="$CORE_LIBS -lthr" - ;; - - linuxthreads) - have=NGX_THREADS . auto/have - have=NGX_LINUXTHREADS . auto/have - CFLAGS="$CFLAGS -D_THREAD_SAFE" - CFLAGS="$CFLAGS -I /usr/local/include/pthread/linuxthreads" - CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS" - CORE_LIBS="$CORE_LIBS -L /usr/local/lib -llthread -llgcc_r" - ;; - - libc_r) - case "$NGX_PLATFORM" in - FreeBSD:[34]*) - have=NGX_THREADS . auto/have - CFLAGS="$CFLAGS -pthread" - CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS" - CORE_LIBS="$CORE_LIBS -pthread" - ;; - - FreeBSD:[56]*) - have=NGX_THREADS . auto/have - CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS" - CORE_LIBS="$CORE_LIBS -lc_r" - ;; - esac - ;; - - NO) - ;; - - *) - have=NGX_THREADS . auto/have - CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS" - CORE_LIBS="$CORE_LIBS -l$USE_THREADS" - ;; - -esac