Mercurial > hg > nginx
annotate auto/lib/pcre/conf @ 4160:88369902edb1 stable-1.0
Merging r4010, r4065:
SSL related fixes:
*) Fixing proxy_set_body and proxy_pass_request_body with SSL.
Flush flag wasn't set in constructed buffer and this prevented any data
from being actually sent to upstream due to SSL buffering. Make sure
we always set flush in the last buffer we are going to sent.
See here for report:
http://nginx.org/pipermail/nginx-ru/2011-June/041552.html
*) Proper SSL shutdown handling.
If connection has unsent alerts, SSL_shutdown() tries to send them even
if SSL_set_shutdown(SSL_RECEIVED_SHUTDOWN|SSL_SENT_SHUTDOWN) was used.
This can be prevented by SSL_set_quiet_shutdown(). SSL_set_shutdown()
is required nevertheless to preserve session.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 30 Sep 2011 13:42:59 +0000 |
parents | 4d47a0658e7d |
children | 005fc2d5e84f 4919fb357a5d |
rev | line source |
---|---|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
320
diff
changeset
|
1 |
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
320
diff
changeset
|
2 # Copyright (C) Igor Sysoev |
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
320
diff
changeset
|
3 |
255
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
4 |
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
5 if [ $PCRE != NONE ]; then |
297
ee394e997c77
nginx-0.0.3-2004-03-29-21:43:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
295
diff
changeset
|
6 CORE_INCS="$CORE_INCS $PCRE" |
255
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 CORE_DEPS="$CORE_DEPS $REGEX_DEPS" |
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
8 CORE_SRCS="$CORE_SRCS $REGEX_SRCS" |
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
9 |
455 | 10 case "$NGX_CC_NAME" in |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
263
diff
changeset
|
11 |
461 | 12 msvc* | owc* | bcc) |
455 | 13 have=NGX_PCRE . auto/have |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
263
diff
changeset
|
14 have=PCRE_STATIC . auto/have |
288
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
286
diff
changeset
|
15 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" |
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
286
diff
changeset
|
16 LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib" |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
263
diff
changeset
|
17 CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib" |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
263
diff
changeset
|
18 ;; |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
263
diff
changeset
|
19 |
1307
811fb97b9bf7
fix building PCRE by SunStudio
Igor Sysoev <igor@sysoev.ru>
parents:
1306
diff
changeset
|
20 icc* ) |
455 | 21 have=NGX_PCRE . auto/have |
288
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
286
diff
changeset
|
22 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" |
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
286
diff
changeset
|
23 |
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
286
diff
changeset
|
24 LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" |
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
286
diff
changeset
|
25 |
523 | 26 echo $ngx_n "checking for PCRE library ...$ngx_c" |
27 | |
1306 | 28 if [ -f $PCRE/pcre.h ]; then |
1006
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
29 ngx_pcre_ver=`grep PCRE_MAJOR $PCRE/pcre.h \ |
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
30 | sed -e 's/^.*PCRE_MAJOR.* \(.*\)$/\1/'` |
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
31 |
1321 | 32 else if [ -f $PCRE/configure.in ]; then |
1006
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
33 ngx_pcre_ver=`grep PCRE_MAJOR= $PCRE/configure.in \ |
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
34 | sed -e 's/^.*=\(.*\)$/\1/'` |
1305
1476d32c66a7
icc/sunc and PCRE-7.1+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
1085
diff
changeset
|
35 |
1476d32c66a7
icc/sunc and PCRE-7.1+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
1085
diff
changeset
|
36 else |
1476d32c66a7
icc/sunc and PCRE-7.1+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
1085
diff
changeset
|
37 ngx_pcre_ver=`grep pcre_major, $PCRE/configure.ac \ |
1476d32c66a7
icc/sunc and PCRE-7.1+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
1085
diff
changeset
|
38 | sed -e 's/^.*pcre_major,.*\[\(.*\)\].*$/\1/'` |
1476d32c66a7
icc/sunc and PCRE-7.1+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
1085
diff
changeset
|
39 fi |
1006
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
40 fi |
523 | 41 |
42 echo " $ngx_pcre_ver major version found" | |
43 | |
288
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
286
diff
changeset
|
44 # to allow -ipo optimization we link with the *.o but not library |
523 | 45 |
46 case "$ngx_pcre_ver" in | |
1006
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
47 4|5) |
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
48 CORE_LIBS="$CORE_LIBS $PCRE/pcre.o" |
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
49 ;; |
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
50 |
523 | 51 6) |
52 CORE_LIBS="$CORE_LIBS $PCRE/pcre_chartables.o" | |
53 CORE_LIBS="$CORE_LIBS $PCRE/pcre_compile.o" | |
54 CORE_LIBS="$CORE_LIBS $PCRE/pcre_exec.o" | |
55 CORE_LIBS="$CORE_LIBS $PCRE/pcre_fullinfo.o" | |
56 CORE_LIBS="$CORE_LIBS $PCRE/pcre_globals.o" | |
57 CORE_LIBS="$CORE_LIBS $PCRE/pcre_tables.o" | |
58 CORE_LIBS="$CORE_LIBS $PCRE/pcre_try_flipped.o" | |
59 ;; | |
60 | |
61 *) | |
1006
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
62 CORE_LIBS="$CORE_LIBS $PCRE/pcre_chartables.o" |
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
63 CORE_LIBS="$CORE_LIBS $PCRE/pcre_compile.o" |
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
64 CORE_LIBS="$CORE_LIBS $PCRE/pcre_exec.o" |
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
65 CORE_LIBS="$CORE_LIBS $PCRE/pcre_fullinfo.o" |
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
66 CORE_LIBS="$CORE_LIBS $PCRE/pcre_globals.o" |
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
67 CORE_LIBS="$CORE_LIBS $PCRE/pcre_tables.o" |
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
68 CORE_LIBS="$CORE_LIBS $PCRE/pcre_try_flipped.o" |
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
69 CORE_LIBS="$CORE_LIBS $PCRE/pcre_newline.o" |
523 | 70 ;; |
1006
0d0c74b73573
icc and PCRE-6.5+ compatibility
Igor Sysoev <igor@sysoev.ru>
parents:
876
diff
changeset
|
71 |
523 | 72 esac |
288
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
286
diff
changeset
|
73 ;; |
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
286
diff
changeset
|
74 |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
263
diff
changeset
|
75 *) |
455 | 76 have=NGX_PCRE . auto/have |
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
77 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" |
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
78 LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" |
306
6b91bfbc4123
nginx-0.0.3-2004-04-05-00:32:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
79 CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a" |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
263
diff
changeset
|
80 ;; |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
263
diff
changeset
|
81 |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
263
diff
changeset
|
82 esac |
255
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
83 |
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
84 else |
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
85 |
493 | 86 if [ "$NGX_PLATFORM" != win32 ]; then |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
87 |
455 | 88 PCRE=NO |
255
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
89 |
455 | 90 ngx_feature="PCRE library" |
469 | 91 ngx_feature_name="NGX_PCRE" |
455 | 92 ngx_feature_run=no |
93 ngx_feature_incs="#include <pcre.h>" | |
875
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
577
diff
changeset
|
94 ngx_feature_path= |
455 | 95 ngx_feature_libs="-lpcre" |
96 ngx_feature_test="pcre *re; re = pcre_compile(NULL, 0, NULL, 0, NULL)" | |
97 . auto/feature | |
255
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
98 |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
99 if [ $ngx_found = no ]; then |
875
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
577
diff
changeset
|
100 |
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
577
diff
changeset
|
101 # FreeBSD port |
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
577
diff
changeset
|
102 |
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
577
diff
changeset
|
103 ngx_feature="PCRE library in /usr/local/" |
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
577
diff
changeset
|
104 ngx_feature_path="/usr/local/include" |
1490 | 105 |
106 if [ $NGX_RPATH = YES ]; then | |
107 ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lpcre" | |
108 else | |
109 ngx_feature_libs="-L/usr/local/lib -lpcre" | |
110 fi | |
111 | |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
112 . auto/feature |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
113 fi |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
114 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
115 if [ $ngx_found = no ]; then |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
116 |
2141 | 117 # RedHat RPM, Solaris package |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
118 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
119 ngx_feature="PCRE library in /usr/include/pcre/" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
120 ngx_feature_path="/usr/include/pcre" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
121 ngx_feature_libs="-lpcre" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
122 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
123 . auto/feature |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
124 fi |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
125 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
126 if [ $ngx_found = no ]; then |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
127 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
128 # NetBSD port |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
129 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
130 ngx_feature="PCRE library in /usr/pkg/" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
131 ngx_feature_path="/usr/pkg/include" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
132 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
133 if [ $NGX_RPATH = YES ]; then |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
134 ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lpcre" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
135 else |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
136 ngx_feature_libs="-L/usr/pkg/lib -lpcre" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
137 fi |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
138 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
139 . auto/feature |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
140 fi |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
141 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
142 if [ $ngx_found = no ]; then |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
143 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
144 # MacPorts |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
145 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
146 ngx_feature="PCRE library in /opt/local/" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
147 ngx_feature_path="/opt/local/include" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
148 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
149 if [ $NGX_RPATH = YES ]; then |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
150 ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lpcre" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
151 else |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
152 ngx_feature_libs="-L/opt/local/lib -lpcre" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
153 fi |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1490
diff
changeset
|
154 |
875
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
577
diff
changeset
|
155 . auto/feature |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
263
diff
changeset
|
156 fi |
875
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
577
diff
changeset
|
157 |
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
577
diff
changeset
|
158 if [ $ngx_found = yes ]; then |
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
577
diff
changeset
|
159 CORE_DEPS="$CORE_DEPS $REGEX_DEPS" |
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
577
diff
changeset
|
160 CORE_SRCS="$CORE_SRCS $REGEX_SRCS" |
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
577
diff
changeset
|
161 CORE_INCS="$CORE_INCS $ngx_feature_path" |
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
577
diff
changeset
|
162 CORE_LIBS="$CORE_LIBS $ngx_feature_libs" |
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
577
diff
changeset
|
163 PCRE=YES |
3684
4d47a0658e7d
stop ./configure on Win32 if no library sources was specified,
Igor Sysoev <igor@sysoev.ru>
parents:
2893
diff
changeset
|
164 fi |
4d47a0658e7d
stop ./configure on Win32 if no library sources was specified,
Igor Sysoev <igor@sysoev.ru>
parents:
2893
diff
changeset
|
165 fi |
2893
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2141
diff
changeset
|
166 |
3684
4d47a0658e7d
stop ./configure on Win32 if no library sources was specified,
Igor Sysoev <igor@sysoev.ru>
parents:
2893
diff
changeset
|
167 if [ $PCRE != YES ]; then |
2893
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2141
diff
changeset
|
168 cat << END |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2141
diff
changeset
|
169 |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2141
diff
changeset
|
170 $0: error: the HTTP rewrite module requires the PCRE library. |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2141
diff
changeset
|
171 You can either disable the module by using --without-http_rewrite_module |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2141
diff
changeset
|
172 option, or install the PCRE library into the system, or build the PCRE library |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2141
diff
changeset
|
173 statically from the source with nginx by using --with-pcre=<path> option. |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2141
diff
changeset
|
174 |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2141
diff
changeset
|
175 END |
3684
4d47a0658e7d
stop ./configure on Win32 if no library sources was specified,
Igor Sysoev <igor@sysoev.ru>
parents:
2893
diff
changeset
|
176 exit 1 |
4d47a0658e7d
stop ./configure on Win32 if no library sources was specified,
Igor Sysoev <igor@sysoev.ru>
parents:
2893
diff
changeset
|
177 fi |
2893
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2141
diff
changeset
|
178 |
255
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
179 fi |