Mercurial > hg > nginx-ranges
comparison auto/lib/pcre/conf @ 4:4b2dafa26fe2 NGINX_0_1_2
nginx 0.1.2
*) Feature: the --user=USER, --group=GROUP, and --with-ld-opt=OPTIONS
options in configure.
*) Feature: the server_name directive supports *.domain.tld.
*) Bugfix: the portability improvements.
*) Bugfix: if configuration file was set in command line, the
reconfiguration was impossible; bug appeared in 0.1.1.
*) Bugfix: proxy module may get caught in an endless loop when sendfile
is not used.
*) Bugfix: with sendfile the response was not recoded according to the
charset module directives; bug appeared in 0.1.1.
*) Bugfix: very seldom bug in the kqueue processing.
*) Bugfix: the gzip module compressed the proxied responses that was
already compressed.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Thu, 21 Oct 2004 00:00:00 +0400 |
parents | f0b350454894 |
children | 46833bd150cb |
comparison
equal
deleted
inserted
replaced
3:8beaf7b3241f | 4:4b2dafa26fe2 |
---|---|
5 if [ $PCRE != NONE ]; then | 5 if [ $PCRE != NONE ]; then |
6 CORE_INCS="$CORE_INCS $PCRE" | 6 CORE_INCS="$CORE_INCS $PCRE" |
7 CORE_DEPS="$CORE_DEPS $REGEX_DEPS" | 7 CORE_DEPS="$CORE_DEPS $REGEX_DEPS" |
8 CORE_SRCS="$CORE_SRCS $REGEX_SRCS" | 8 CORE_SRCS="$CORE_SRCS $REGEX_SRCS" |
9 | 9 |
10 case "$CC" in | 10 case "$NGX_CC_NAME" in |
11 | 11 |
12 cl | wcl386 | bcc32) | 12 msvc | owc | bcc) |
13 have=HAVE_PCRE . auto/have | 13 have=NGX_PCRE . auto/have |
14 have=PCRE_STATIC . auto/have | 14 have=PCRE_STATIC . auto/have |
15 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" | 15 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" |
16 LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib" | 16 LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib" |
17 CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib" | 17 CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib" |
18 ;; | 18 ;; |
19 | 19 |
20 *icc) | 20 icc) |
21 have=HAVE_PCRE . auto/have | 21 have=NGX_PCRE . auto/have |
22 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" | 22 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" |
23 | 23 |
24 LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" | 24 LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" |
25 | 25 |
26 # to allow -ipo optimization we link with the *.o but not library | 26 # to allow -ipo optimization we link with the *.o but not library |
29 CORE_LIBS="$CORE_LIBS $PCRE/study.o" | 29 CORE_LIBS="$CORE_LIBS $PCRE/study.o" |
30 CORE_LIBS="$CORE_LIBS $PCRE/pcre.o" | 30 CORE_LIBS="$CORE_LIBS $PCRE/pcre.o" |
31 ;; | 31 ;; |
32 | 32 |
33 *) | 33 *) |
34 have=HAVE_PCRE . auto/have | 34 have=NGX_PCRE . auto/have |
35 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" | 35 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" |
36 LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" | 36 LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" |
37 CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a" | 37 CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a" |
38 #CORE_LIBS="$CORE_LIBS -L $PCRE/.libs -lpcre" | 38 #CORE_LIBS="$CORE_LIBS -L $PCRE/.libs -lpcre" |
39 ;; | 39 ;; |
41 esac | 41 esac |
42 | 42 |
43 else | 43 else |
44 | 44 |
45 if [ $PLATFORM != win32 ]; then | 45 if [ $PLATFORM != win32 ]; then |
46 PCRE=NO | 46 PCRE=NO |
47 ngx_lib_cflags= | |
48 | 47 |
49 # Linux | 48 # FreeBSD PCRE port requires --with-cc-opt="-I /usr/local/include" |
50 | 49 # --with-ld-opt="-L /usr/local/lib" |
51 ngx_lib_inc="#include <pcre.h>" | 50 |
52 ngx_lib="PCRE library" | 51 ngx_feature="PCRE library" |
53 ngx_lib_test="pcre *re; re = pcre_compile(NULL, 0, NULL, 0, NULL)" | 52 ngx_feature_name="PCRE" |
54 ngx_libs="-lpcre" | 53 ngx_feature_run=no |
55 . auto/lib/test | 54 ngx_feature_incs="#include <pcre.h>" |
56 | 55 ngx_feature_libs="-lpcre" |
56 ngx_feature_test="pcre *re; re = pcre_compile(NULL, 0, NULL, 0, NULL)" | |
57 . auto/feature | |
57 | 58 |
58 if [ $ngx_found = yes ]; then | 59 if [ $ngx_found = yes ]; then |
59 have=HAVE_PCRE . auto/have | |
60 CORE_DEPS="$CORE_DEPS $REGEX_DEPS" | 60 CORE_DEPS="$CORE_DEPS $REGEX_DEPS" |
61 CORE_SRCS="$CORE_SRCS $REGEX_SRCS" | 61 CORE_SRCS="$CORE_SRCS $REGEX_SRCS" |
62 CORE_LIBS="$CORE_LIBS $ngx_libs" | 62 CORE_LIBS="$CORE_LIBS $ngx_feature_libs" |
63 PCRE=YES | 63 PCRE=YES |
64 ngx_found=no | 64 ngx_found=no |
65 | |
66 else | |
67 # FreeBSD PCRE port. | |
68 | |
69 ngx_lib="PCRE library in /usr/local/" | |
70 ngx_lib_cflags="-I /usr/local/include" | |
71 ngx_libs="-L /usr/local/lib -lpcre" | |
72 . auto/lib/test | |
73 fi | |
74 | |
75 | |
76 if [ $ngx_found = yes ]; then | |
77 have=HAVE_PCRE . auto/have | |
78 CORE_DEPS="$CORE_DEPS $REGEX_DEPS" | |
79 CORE_INCS="$CORE_INCS /usr/local/include" | |
80 CORE_SRCS="$CORE_SRCS $REGEX_SRCS" | |
81 CORE_LIBS="$CORE_LIBS $ngx_libs" | |
82 PCRE=YES | |
83 fi | 65 fi |
84 fi | 66 fi |
85 | |
86 fi | 67 fi |