Mercurial > hg > nginx-vendor-current
diff auto/lib/pcre/conf @ 72:b31656313b59 NGINX_0_1_36
nginx 0.1.36
*) Change: if the request header has duplicate the "Host",
"Connection", "Content-Length", or "Authorization" lines, then nginx
now returns the 400 error.
*) Change: the "post_accept_timeout" directive was canceled.
*) Feature: the "default", "af=", "bl=", "deferred", and "bind"
parameters of the "listen" directive.
*) Feature: the FreeBSD accept filters support.
*) Feature: the Linux TCP_DEFER_ACCEPT support.
*) Bugfix: the ngx_http_autoindex_module did not support the file names
in UTF-8.
*) Bugfix: the new log file can be rotated by the -USR1 signal only if
the reconfiguration by the -HUP signal was made twice.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Wed, 15 Jun 2005 00:00:00 +0400 |
| parents | 41ccba1aba45 |
| children | dad2fe8ecf08 |
line wrap: on
line diff
--- a/auto/lib/pcre/conf +++ b/auto/lib/pcre/conf @@ -23,11 +23,30 @@ if [ $PCRE != NONE ]; then LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" + echo $ngx_n "checking for PCRE library ...$ngx_c" + + ngx_pcre_ver=`grep PCRE_MAJOR= $PCRE/configure.in \ + | sed -e 's/^.*=\(.*\)$/\1/'` + + echo " $ngx_pcre_ver major version found" + # 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" + + case "$ngx_pcre_ver" in + 6) + CORE_LIBS="$CORE_LIBS $PCRE/pcre_chartables.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_compile.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_exec.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_fullinfo.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_globals.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_tables.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_try_flipped.o" + ;; + + *) + CORE_LIBS="$CORE_LIBS $PCRE/pcre.o" + ;; + esac ;; *)