mirror of
https://github.com/nginx/nginx.git
synced 2024-12-20 06:03:31 -06:00
d039a2e193
*) Bugfix: the ngx_http_stub_status_module showed incorrect statistics
if "rtsig" method was used or if several worker process ran on SMP.
*) Bugfix: nginx could not be built by the icc compiler on Linux or if
the zlib-1.2.x library was building from sources.
*) Bugfix: nginx could not be built on NetBSD 2.0.
68 lines
1.9 KiB
Plaintext
68 lines
1.9 KiB
Plaintext
|
|
# Copyright (C) Igor Sysoev
|
|
|
|
|
|
if [ $PCRE != NONE ]; then
|
|
CORE_INCS="$CORE_INCS $PCRE"
|
|
CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
|
|
CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
|
|
|
|
case "$NGX_CC_NAME" in
|
|
|
|
msvc* | owc* | bcc)
|
|
have=NGX_PCRE . auto/have
|
|
have=PCRE_STATIC . auto/have
|
|
CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
|
|
LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib"
|
|
CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib"
|
|
;;
|
|
|
|
icc*)
|
|
have=NGX_PCRE . auto/have
|
|
CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
|
|
|
|
LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"
|
|
|
|
# to allow -ipo optimization we link with the *.o but not library
|
|
CORE_LIBS="$CORE_LIBS $PCRE/maketables.o"
|
|
CORE_LIBS="$CORE_LIBS $PCRE/get.o"
|
|
CORE_LIBS="$CORE_LIBS $PCRE/study.o"
|
|
CORE_LIBS="$CORE_LIBS $PCRE/pcre.o"
|
|
;;
|
|
|
|
*)
|
|
have=NGX_PCRE . auto/have
|
|
CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
|
|
LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"
|
|
CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a"
|
|
#CORE_LIBS="$CORE_LIBS -L $PCRE/.libs -lpcre"
|
|
;;
|
|
|
|
esac
|
|
|
|
else
|
|
|
|
if [ "$NGX_PLATFORM" != win32 ]; then
|
|
PCRE=NO
|
|
|
|
# FreeBSD PCRE port requires --with-cc-opt="-I /usr/local/include"
|
|
# --with-ld-opt="-L /usr/local/lib"
|
|
|
|
ngx_feature="PCRE library"
|
|
ngx_feature_name="NGX_PCRE"
|
|
ngx_feature_run=no
|
|
ngx_feature_incs="#include <pcre.h>"
|
|
ngx_feature_libs="-lpcre"
|
|
ngx_feature_test="pcre *re; re = pcre_compile(NULL, 0, NULL, 0, NULL)"
|
|
. auto/feature
|
|
|
|
if [ $ngx_found = yes ]; then
|
|
CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
|
|
CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
|
|
CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
|
|
PCRE=YES
|
|
ngx_found=no
|
|
fi
|
|
fi
|
|
fi
|