Mercurial > hg > nginx
comparison auto/make @ 681:7e24168b0853 release-0.4.0
nginx-0.4.0-RELEASE import
*) Change in internal API: the HTTP modules initialization was moved
from the init module phase to the HTTP postconfiguration phase.
*) Change: now the request body is not read beforehand for the
ngx_http_perl_module: it's required to start the reading using the
$r->has_request_body method.
*) Feature: the ngx_http_perl_module supports the DECLINED return code.
*) Feature: the ngx_http_dav_module supports the incoming "Date" header
line for the PUT method.
*) Feature: the "ssi" directive is available inside the "if" block.
*) Bugfix: a segmentation fault occurred if there was an "index"
directive with variables and the first index name was without
variables; the bug had appeared in 0.1.29.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 30 Aug 2006 10:39:17 +0000 |
parents | 63a820b0bc6c |
children | 68f30ab68bb7 |
comparison
equal
deleted
inserted
replaced
680:63a949f7ed4f | 681:7e24168b0853 |
---|---|
19 CFLAGS = $CFLAGS | 19 CFLAGS = $CFLAGS |
20 CPP = $CPP | 20 CPP = $CPP |
21 LINK = $LINK | 21 LINK = $LINK |
22 | 22 |
23 END | 23 END |
24 | |
25 if test -n "$NGX_PERL_CFLAGS"; then | |
26 echo NGX_PERL_CFLAGS = $NGX_PERL_CFLAGS >> $NGX_MAKEFILE | |
27 echo NGX_PM_CFLAGS = $NGX_PM_CFLAGS >> $NGX_MAKEFILE | |
28 fi | |
24 | 29 |
25 if [ "$BMAKE" = wmake ]; then | 30 if [ "$BMAKE" = wmake ]; then |
26 echo MAKE = wmake >> $NGX_MAKEFILE | 31 echo MAKE = wmake >> $NGX_MAKEFILE |
27 | 32 |
28 ngx_regex_cont=' ' | 33 ngx_regex_cont=' ' |
236 | 241 |
237 if test -n "$NGX_PCH"; then | 242 if test -n "$NGX_PCH"; then |
238 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" | 243 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" |
239 else | 244 else |
240 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(HTTP_INCS)" | 245 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(HTTP_INCS)" |
246 ngx_perl_cc="\$(CC) $ngx_compile_opt \$(NGX_PERL_CFLAGS) " | |
247 ngx_perl_cc="$ngx_perl_cc \$(CORE_INCS) \$(HTTP_INCS)" | |
241 fi | 248 fi |
242 | 249 |
243 for ngx_src in $HTTP_SRCS | 250 for ngx_source in $HTTP_SRCS |
244 do | 251 do |
245 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` | 252 ngx_src=`echo $ngx_source | sed -e "s/\//$ngx_regex_dirsep/g"` |
246 ngx_obj=`echo $ngx_src \ | 253 ngx_obj=`echo $ngx_src \ |
247 | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \ | 254 | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \ |
248 -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \ | 255 -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \ |
249 -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \ | 256 -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \ |
250 -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"` | 257 -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"` |
251 | 258 |
252 cat << END >> $NGX_MAKEFILE | 259 if [ $ngx_source = src/http/modules/perl/ngx_http_perl_module.c ]; then |
260 | |
261 cat << END >> $NGX_MAKEFILE | |
262 | |
263 $ngx_obj: \$(CORE_DEPS) \$(HTTP_DEPS)$ngx_cont$ngx_src | |
264 $ngx_perl_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX | |
265 | |
266 END | |
267 else | |
268 | |
269 cat << END >> $NGX_MAKEFILE | |
253 | 270 |
254 $ngx_obj: \$(CORE_DEPS) \$(HTTP_DEPS)$ngx_cont$ngx_src | 271 $ngx_obj: \$(CORE_DEPS) \$(HTTP_DEPS)$ngx_cont$ngx_src |
255 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX | 272 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX |
256 | 273 |
257 END | 274 END |
275 | |
276 fi | |
258 done | 277 done |
259 | 278 |
260 fi | 279 fi |
261 | 280 |
262 | 281 |