comparison auto/modules @ 570:9773720b845e

Merge with 0.8.16.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 26 Sep 2009 01:25:07 +0400
parents 1e91f9968443 86dad910eeb6
children 0b460e61bdcd
comparison
equal deleted inserted replaced
511:1e91f9968443 570:9773720b845e
39 CORE_SRCS="$CORE_SRCS $EVENTPORT_SRCS" 39 CORE_SRCS="$CORE_SRCS $EVENTPORT_SRCS"
40 fi 40 fi
41 41
42 if [ $NGX_TEST_BUILD_EPOLL = YES ]; then 42 if [ $NGX_TEST_BUILD_EPOLL = YES ]; then
43 have=NGX_HAVE_EPOLL . auto/have 43 have=NGX_HAVE_EPOLL . auto/have
44 have=NGX_HAVE_EVENTFD . auto/have
44 have=NGX_TEST_BUILD_EPOLL . auto/have 45 have=NGX_TEST_BUILD_EPOLL . auto/have
45 EVENT_MODULES="$EVENT_MODULES $EPOLL_MODULE" 46 EVENT_MODULES="$EVENT_MODULES $EPOLL_MODULE"
46 CORE_SRCS="$CORE_SRCS $EPOLL_SRCS" 47 CORE_SRCS="$CORE_SRCS $EPOLL_SRCS"
47 fi 48 fi
48 49
102 # ngx_http_gzip_filter 103 # ngx_http_gzip_filter
103 # ngx_http_postpone_filter 104 # ngx_http_postpone_filter
104 # ngx_http_charset_filter 105 # ngx_http_charset_filter
105 # ngx_http_ssi_filter 106 # ngx_http_ssi_filter
106 # ngx_http_xslt_filter 107 # ngx_http_xslt_filter
108 # ngx_http_image_filter_filter
107 # ngx_http_sub_filter 109 # ngx_http_sub_filter
108 # ngx_http_addition_filter 110 # ngx_http_addition_filter
109 # ngx_http_userid_filter 111 # ngx_http_userid_filter
110 # ngx_http_headers_filter 112 # ngx_http_headers_filter
111 # ngx_http_copy_filter 113 # ngx_http_copy_filter
146 USE_LIBXSLT=YES 148 USE_LIBXSLT=YES
147 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_XSLT_FILTER_MODULE" 149 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_XSLT_FILTER_MODULE"
148 HTTP_SRCS="$HTTP_SRCS $HTTP_XSLT_SRCS" 150 HTTP_SRCS="$HTTP_SRCS $HTTP_XSLT_SRCS"
149 fi 151 fi
150 152
153 if [ $HTTP_IMAGE_FILTER = YES ]; then
154 USE_LIBGD=YES
155 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_IMAGE_FILTER_MODULE"
156 HTTP_SRCS="$HTTP_SRCS $HTTP_IMAGE_SRCS"
157 fi
158
151 if [ $HTTP_SUB = YES ]; then 159 if [ $HTTP_SUB = YES ]; then
152 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SUB_FILTER_MODULE" 160 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SUB_FILTER_MODULE"
153 HTTP_SRCS="$HTTP_SRCS $HTTP_SUB_SRCS" 161 HTTP_SRCS="$HTTP_SRCS $HTTP_SUB_SRCS"
154 fi 162 fi
155 163
229 237
230 if [ $HTTP_GEO = YES ]; then 238 if [ $HTTP_GEO = YES ]; then
231 have=NGX_HTTP_GEO . auto/have 239 have=NGX_HTTP_GEO . auto/have
232 HTTP_MODULES="$HTTP_MODULES $HTTP_GEO_MODULE" 240 HTTP_MODULES="$HTTP_MODULES $HTTP_GEO_MODULE"
233 HTTP_SRCS="$HTTP_SRCS $HTTP_GEO_SRCS" 241 HTTP_SRCS="$HTTP_SRCS $HTTP_GEO_SRCS"
242 fi
243
244 if [ $HTTP_GEOIP = YES ]; then
245 have=NGX_HTTP_GEOIP . auto/have
246 HTTP_MODULES="$HTTP_MODULES $HTTP_GEOIP_MODULE"
247 HTTP_SRCS="$HTTP_SRCS $HTTP_GEOIP_SRCS"
234 fi 248 fi
235 249
236 if [ $HTTP_MAP = YES ]; then 250 if [ $HTTP_MAP = YES ]; then
237 have=NGX_HTTP_MAP . auto/have 251 have=NGX_HTTP_MAP . auto/have
238 HTTP_MODULES="$HTTP_MODULES $HTTP_MAP_MODULE" 252 HTTP_MODULES="$HTTP_MODULES $HTTP_MAP_MODULE"