comparison auto/modules @ 635:e67b227c8dbb default tip

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents f3a9e57d2e17 c5122335e41d
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
100 # ngx_http_header_filter 100 # ngx_http_header_filter
101 # ngx_http_chunked_filter 101 # ngx_http_chunked_filter
102 # ngx_http_range_header_filter 102 # ngx_http_range_header_filter
103 # ngx_http_gzip_filter 103 # ngx_http_gzip_filter
104 # ngx_http_postpone_filter 104 # ngx_http_postpone_filter
105 # ngx_http_ssi_filter
105 # ngx_http_charset_filter 106 # ngx_http_charset_filter
106 # ngx_http_ssi_filter
107 # ngx_http_xslt_filter 107 # ngx_http_xslt_filter
108 # ngx_http_image_filter_filter 108 # ngx_http_image_filter
109 # ngx_http_sub_filter 109 # ngx_http_sub_filter
110 # ngx_http_addition_filter 110 # ngx_http_addition_filter
111 # ngx_http_userid_filter 111 # ngx_http_userid_filter
112 # ngx_http_headers_filter 112 # ngx_http_headers_filter
113 # ngx_http_copy_filter 113 # ngx_http_copy_filter
131 if [ $HTTP_POSTPONE = YES ]; then 131 if [ $HTTP_POSTPONE = YES ]; then
132 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE" 132 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE"
133 HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS" 133 HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS"
134 fi 134 fi
135 135
136 if [ $HTTP_CHARSET = YES ]; then
137 have=NGX_HTTP_CHARSET . auto/have
138 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE"
139 HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS"
140 fi
141
142 if [ $HTTP_SSI = YES ]; then 136 if [ $HTTP_SSI = YES ]; then
143 have=NGX_HTTP_SSI . auto/have 137 have=NGX_HTTP_SSI . auto/have
144 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SSI_FILTER_MODULE" 138 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SSI_FILTER_MODULE"
145 HTTP_DEPS="$HTTP_DEPS $HTTP_SSI_DEPS" 139 HTTP_DEPS="$HTTP_DEPS $HTTP_SSI_DEPS"
146 HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS" 140 HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS"
147 fi 141 fi
148 142
143 if [ $HTTP_CHARSET = YES ]; then
144 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE"
145 HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS"
146 fi
147
149 if [ $HTTP_XSLT = YES ]; then 148 if [ $HTTP_XSLT = YES ]; then
150 USE_LIBXSLT=YES 149 USE_LIBXSLT=YES
151 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_XSLT_FILTER_MODULE" 150 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_XSLT_FILTER_MODULE"
152 HTTP_SRCS="$HTTP_SRCS $HTTP_XSLT_SRCS" 151 HTTP_SRCS="$HTTP_SRCS $HTTP_XSLT_SRCS"
153 fi 152 fi
186 HTTP_MODULES="$HTTP_MODULES $HTTP_DAV_MODULE" 185 HTTP_MODULES="$HTTP_MODULES $HTTP_DAV_MODULE"
187 HTTP_SRCS="$HTTP_SRCS $HTTP_DAV_SRCS" 186 HTTP_SRCS="$HTTP_SRCS $HTTP_DAV_SRCS"
188 fi 187 fi
189 188
190 if [ $HTTP_AUTOINDEX = YES ]; then 189 if [ $HTTP_AUTOINDEX = YES ]; then
191 have=NGX_HTTP_AUTOINDEX . auto/have
192 HTTP_MODULES="$HTTP_MODULES $HTTP_AUTOINDEX_MODULE" 190 HTTP_MODULES="$HTTP_MODULES $HTTP_AUTOINDEX_MODULE"
193 HTTP_SRCS="$HTTP_SRCS $HTTP_AUTOINDEX_SRCS" 191 HTTP_SRCS="$HTTP_SRCS $HTTP_AUTOINDEX_SRCS"
194 fi 192 fi
195 193
196 HTTP_MODULES="$HTTP_MODULES $HTTP_INDEX_MODULE" 194 HTTP_MODULES="$HTTP_MODULES $HTTP_INDEX_MODULE"
197 195
198 if [ $HTTP_RANDOM_INDEX = YES ]; then 196 if [ $HTTP_RANDOM_INDEX = YES ]; then
199 have=NGX_HTTP_RANDOM_INDEX . auto/have
200 HTTP_MODULES="$HTTP_MODULES $HTTP_RANDOM_INDEX_MODULE" 197 HTTP_MODULES="$HTTP_MODULES $HTTP_RANDOM_INDEX_MODULE"
201 HTTP_SRCS="$HTTP_SRCS $HTTP_RANDOM_INDEX_SRCS" 198 HTTP_SRCS="$HTTP_SRCS $HTTP_RANDOM_INDEX_SRCS"
202 fi 199 fi
203 200
204 if [ $HTTP_AUTH_BASIC = YES ]; then 201 if [ $HTTP_AUTH_BASIC = YES ]; then
205 have=NGX_HTTP_AUTH_BASIC . auto/have
206 have=NGX_CRYPT . auto/have 202 have=NGX_CRYPT . auto/have
207 HTTP_MODULES="$HTTP_MODULES $HTTP_AUTH_BASIC_MODULE" 203 HTTP_MODULES="$HTTP_MODULES $HTTP_AUTH_BASIC_MODULE"
208 HTTP_SRCS="$HTTP_SRCS $HTTP_AUTH_BASIC_SRCS" 204 HTTP_SRCS="$HTTP_SRCS $HTTP_AUTH_BASIC_SRCS"
209 CORE_LIBS="$CORE_LIBS $CRYPT_LIB" 205 CORE_LIBS="$CORE_LIBS $CRYPT_LIB"
210 fi 206 fi
211 207
212 if [ $HTTP_ACCESS = YES ]; then 208 if [ $HTTP_ACCESS = YES ]; then
213 have=NGX_HTTP_ACCESS . auto/have
214 HTTP_MODULES="$HTTP_MODULES $HTTP_ACCESS_MODULE" 209 HTTP_MODULES="$HTTP_MODULES $HTTP_ACCESS_MODULE"
215 HTTP_SRCS="$HTTP_SRCS $HTTP_ACCESS_SRCS" 210 HTTP_SRCS="$HTTP_SRCS $HTTP_ACCESS_SRCS"
216 fi 211 fi
217 212
218 if [ $HTTP_LIMIT_ZONE = YES ]; then 213 if [ $HTTP_LIMIT_ZONE = YES ]; then
230 HTTP_MODULES="$HTTP_MODULES $HTTP_REALIP_MODULE" 225 HTTP_MODULES="$HTTP_MODULES $HTTP_REALIP_MODULE"
231 HTTP_SRCS="$HTTP_SRCS $HTTP_REALIP_SRCS" 226 HTTP_SRCS="$HTTP_SRCS $HTTP_REALIP_SRCS"
232 fi 227 fi
233 228
234 if [ $HTTP_STATUS = YES ]; then 229 if [ $HTTP_STATUS = YES ]; then
235 have=NGX_HTTP_STATUS . auto/have
236 HTTP_MODULES="$HTTP_MODULES $HTTP_STATUS_MODULE" 230 HTTP_MODULES="$HTTP_MODULES $HTTP_STATUS_MODULE"
237 HTTP_SRCS="$HTTP_SRCS $HTTP_STATUS_SRCS" 231 HTTP_SRCS="$HTTP_SRCS $HTTP_STATUS_SRCS"
238 fi 232 fi
239 233
240 if [ $HTTP_GEO = YES ]; then 234 if [ $HTTP_GEO = YES ]; then
242 HTTP_MODULES="$HTTP_MODULES $HTTP_GEO_MODULE" 236 HTTP_MODULES="$HTTP_MODULES $HTTP_GEO_MODULE"
243 HTTP_SRCS="$HTTP_SRCS $HTTP_GEO_SRCS" 237 HTTP_SRCS="$HTTP_SRCS $HTTP_GEO_SRCS"
244 fi 238 fi
245 239
246 if [ $HTTP_GEOIP = YES ]; then 240 if [ $HTTP_GEOIP = YES ]; then
247 have=NGX_HTTP_GEOIP . auto/have
248 HTTP_MODULES="$HTTP_MODULES $HTTP_GEOIP_MODULE" 241 HTTP_MODULES="$HTTP_MODULES $HTTP_GEOIP_MODULE"
249 HTTP_SRCS="$HTTP_SRCS $HTTP_GEOIP_SRCS" 242 HTTP_SRCS="$HTTP_SRCS $HTTP_GEOIP_SRCS"
250 fi 243 fi
251 244
252 if [ $HTTP_MAP = YES ]; then 245 if [ $HTTP_MAP = YES ]; then
253 have=NGX_HTTP_MAP . auto/have
254 HTTP_MODULES="$HTTP_MODULES $HTTP_MAP_MODULE" 246 HTTP_MODULES="$HTTP_MODULES $HTTP_MAP_MODULE"
255 HTTP_SRCS="$HTTP_SRCS $HTTP_MAP_SRCS" 247 HTTP_SRCS="$HTTP_SRCS $HTTP_MAP_SRCS"
248 fi
249
250 if [ $HTTP_SPLIT_CLIENTS = YES ]; then
251 HTTP_MODULES="$HTTP_MODULES $HTTP_SPLIT_CLIENTS_MODULE"
252 HTTP_SRCS="$HTTP_SRCS $HTTP_SPLIT_CLIENTS_SRCS"
256 fi 253 fi
257 254
258 if [ $HTTP_REFERER = YES ]; then 255 if [ $HTTP_REFERER = YES ]; then
259 HTTP_MODULES="$HTTP_MODULES $HTTP_REFERER_MODULE" 256 HTTP_MODULES="$HTTP_MODULES $HTTP_REFERER_MODULE"
260 HTTP_SRCS="$HTTP_SRCS $HTTP_REFERER_SRCS" 257 HTTP_SRCS="$HTTP_SRCS $HTTP_REFERER_SRCS"
261 fi 258 fi
262 259
263 if [ $HTTP_REWRITE = YES -a $USE_PCRE != DISABLED ]; then 260 if [ $HTTP_REWRITE = YES -a $USE_PCRE != DISABLED ]; then
264 have=NGX_HTTP_REWRITE . auto/have
265 USE_PCRE=YES 261 USE_PCRE=YES
266 HTTP_MODULES="$HTTP_MODULES $HTTP_REWRITE_MODULE" 262 HTTP_MODULES="$HTTP_MODULES $HTTP_REWRITE_MODULE"
267 HTTP_SRCS="$HTTP_SRCS $HTTP_REWRITE_SRCS" 263 HTTP_SRCS="$HTTP_SRCS $HTTP_REWRITE_SRCS"
268 fi 264 fi
269 265
286 if [ $HTTP_FASTCGI = YES ]; then 282 if [ $HTTP_FASTCGI = YES ]; then
287 HTTP_MODULES="$HTTP_MODULES $HTTP_FASTCGI_MODULE" 283 HTTP_MODULES="$HTTP_MODULES $HTTP_FASTCGI_MODULE"
288 HTTP_SRCS="$HTTP_SRCS $HTTP_FASTCGI_SRCS" 284 HTTP_SRCS="$HTTP_SRCS $HTTP_FASTCGI_SRCS"
289 fi 285 fi
290 286
287 if [ $HTTP_UWSGI = YES ]; then
288 HTTP_MODULES="$HTTP_MODULES $HTTP_UWSGI_MODULE"
289 HTTP_SRCS="$HTTP_SRCS $HTTP_UWSGI_SRCS"
290 fi
291
292 if [ $HTTP_SCGI = YES ]; then
293 HTTP_MODULES="$HTTP_MODULES $HTTP_SCGI_MODULE"
294 HTTP_SRCS="$HTTP_SRCS $HTTP_SCGI_SRCS"
295 fi
296
291 if [ $HTTP_PERL = YES ]; then 297 if [ $HTTP_PERL = YES ]; then
292 USE_PERL=YES 298 USE_PERL=YES
293 have=NGX_HTTP_PERL . auto/have
294 HTTP_MODULES="$HTTP_MODULES $HTTP_PERL_MODULE" 299 HTTP_MODULES="$HTTP_MODULES $HTTP_PERL_MODULE"
295 HTTP_INCS="$HTTP_INCS $HTTP_PERL_INCS" 300 HTTP_INCS="$HTTP_INCS $HTTP_PERL_INCS"
296 HTTP_DEPS="$HTTP_DEPS $HTTP_PERL_DEPS" 301 HTTP_DEPS="$HTTP_DEPS $HTTP_PERL_DEPS"
297 HTTP_SRCS="$HTTP_SRCS $HTTP_PERL_SRCS" 302 HTTP_SRCS="$HTTP_SRCS $HTTP_PERL_SRCS"
298 fi 303 fi
317 HTTP_MODULES="$HTTP_MODULES $HTTP_SECURE_LINK_MODULE" 322 HTTP_MODULES="$HTTP_MODULES $HTTP_SECURE_LINK_MODULE"
318 HTTP_SRCS="$HTTP_SRCS $HTTP_SECURE_LINK_SRCS" 323 HTTP_SRCS="$HTTP_SRCS $HTTP_SECURE_LINK_SRCS"
319 fi 324 fi
320 325
321 if [ $HTTP_DEGRADATION = YES ]; then 326 if [ $HTTP_DEGRADATION = YES ]; then
327 have=NGX_HTTP_DEGRADATION . auto/have
322 HTTP_MODULES="$HTTP_MODULES $HTTP_DEGRADATION_MODULE" 328 HTTP_MODULES="$HTTP_MODULES $HTTP_DEGRADATION_MODULE"
323 HTTP_SRCS="$HTTP_SRCS $HTTP_DEGRADATION_SRCS" 329 HTTP_SRCS="$HTTP_SRCS $HTTP_DEGRADATION_SRCS"
324 fi 330 fi
325 331
326 if [ $HTTP_FLV = YES ]; then 332 if [ $HTTP_FLV = YES ]; then