Mercurial > hg > nginx-vendor-1-0
comparison auto/make @ 38:2879cd3a40cb NGINX_0_1_19
nginx 0.1.19
*) Bugfix: now, if request contains the zero, then the 404 error is
returned for the local requests.
*) Bugfix: nginx could not be built on NetBSD 2.0.
*) Bugfix: the timeout may occur while reading of the the client
request body via SSL connections.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 16 Feb 2005 00:00:00 +0300 |
parents | 6f8b0dc0f8dd |
children | 71c46860eb55 |
comparison
equal
deleted
inserted
replaced
37:3376a7dea5d6 | 38:2879cd3a40cb |
---|---|
30 ngx_tab=' ' | 30 ngx_tab=' ' |
31 | 31 |
32 fi | 32 fi |
33 | 33 |
34 | 34 |
35 # ALL_INCS, required by OpenWatcom C precompiled headers | 35 # ALL_INCS, required by the addons and by OpenWatcom C precompiled headers |
36 | 36 |
37 ngx_incs=`echo $CORE_INCS $NGX_OBJS $HTTP_INCS $IMAP_INCS\ | 37 ngx_incs=`echo $CORE_INCS $NGX_OBJS $HTTP_INCS $IMAP_INCS\ |
38 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \ | 38 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \ |
39 -e "s/\//$ngx_regex_dirsep/g"` | 39 -e "s/\//$ngx_regex_dirsep/g"` |
40 | 40 |
118 END | 118 END |
119 | 119 |
120 fi | 120 fi |
121 | 121 |
122 | 122 |
123 if test -n "$NGX_ADDON_SRCS"; then | |
124 | |
125 cat << END >> $NGX_MAKEFILE | |
126 | |
127 ADDON_DEPS = \$(CORE_DPES) $NGX_ADDON_DEPS | |
128 | |
129 END | |
130 | |
131 fi | |
132 | |
133 | |
123 # nginx | 134 # nginx |
124 | 135 |
125 ngx_all_srcs=`echo $ngx_all_srcs | sed -e "s/\//$ngx_regex_dirsep/g"` | 136 ngx_all_srcs=`echo $ngx_all_srcs | sed -e "s/\//$ngx_regex_dirsep/g"` |
126 ngx_modules_c=`echo $NGX_MODULES_C | sed -e "s/\//$ngx_regex_dirsep/g"` | 137 |
138 for ngx_src in $NGX_ADDON_SRCS | |
139 do | |
140 ngx_obj="addon/`basename \`dirname $ngx_src\``" | |
141 | |
142 test -d $NGX_OBJS/$ngx_obj || mkdir -p $NGX_OBJS/$ngx_obj | |
143 | |
144 ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \ | |
145 | sed -e "s/\//$ngx_regex_dirsep/g"` | |
146 | |
147 ngx_all_srcs="$ngx_all_srcs $ngx_obj" | |
148 done | |
127 | 149 |
128 ngx_all_objs=`echo $ngx_all_srcs \ | 150 ngx_all_objs=`echo $ngx_all_srcs \ |
129 | sed -e "s/\([^ ]*\.\)cpp/$NGX_OBJS\/\1$ngx_objext/g" \ | 151 | sed -e "s/\([^ ]*\.\)cpp/$NGX_OBJS\/\1$ngx_objext/g" \ |
130 -e "s/\([^ ]*\.\)cc/$NGX_OBJS\/\1$ngx_objext/g" \ | 152 -e "s/\([^ ]*\.\)cc/$NGX_OBJS\/\1$ngx_objext/g" \ |
131 -e "s/\([^ ]*\.\)c/$NGX_OBJS\/\1$ngx_objext/g" \ | 153 -e "s/\([^ ]*\.\)c/$NGX_OBJS\/\1$ngx_objext/g" \ |
132 -e "s/\([^ ]*\.\)S/$NGX_OBJS\/\1$ngx_objext/g"` | 154 -e "s/\([^ ]*\.\)S/$NGX_OBJS\/\1$ngx_objext/g"` |
133 | 155 |
156 ngx_modules_c=`echo $NGX_MODULES_C | sed -e "s/\//$ngx_regex_dirsep/g"` | |
157 | |
134 ngx_modules_obj=`echo $ngx_modules_c | sed -e "s/\(.*\.\)c/\1$ngx_objext/"` | 158 ngx_modules_obj=`echo $ngx_modules_c | sed -e "s/\(.*\.\)c/\1$ngx_objext/"` |
135 | 159 |
136 | 160 |
137 if test -n "$NGX_RES"; then | 161 if test -n "$NGX_RES"; then |
138 ngx_res=$NGX_RES | 162 ngx_res=$NGX_RES |
183 | 207 |
184 # the core sources | 208 # the core sources |
185 | 209 |
186 for ngx_src in $CORE_SRCS | 210 for ngx_src in $CORE_SRCS |
187 do | 211 do |
188 | |
189 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` | 212 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` |
190 ngx_obj=`echo $ngx_src \ | 213 ngx_obj=`echo $ngx_src \ |
191 | sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \ | 214 | sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \ |
192 -e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \ | 215 -e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \ |
193 -e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \ | 216 -e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \ |
213 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(HTTP_INCS)" | 236 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(HTTP_INCS)" |
214 fi | 237 fi |
215 | 238 |
216 for ngx_src in $HTTP_SRCS | 239 for ngx_src in $HTTP_SRCS |
217 do | 240 do |
218 | |
219 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` | 241 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` |
220 ngx_obj=`echo $ngx_src \ | 242 ngx_obj=`echo $ngx_src \ |
221 | sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \ | 243 | sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \ |
222 -e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \ | 244 -e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \ |
223 -e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \ | 245 -e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \ |
227 | 249 |
228 $ngx_obj: \$(CORE_DEPS) \$(HTTP_DEPS)$ngx_cont$ngx_src | 250 $ngx_obj: \$(CORE_DEPS) \$(HTTP_DEPS)$ngx_cont$ngx_src |
229 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src | 251 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src |
230 | 252 |
231 END | 253 END |
232 | |
233 done | 254 done |
234 | 255 |
235 fi | 256 fi |
236 | 257 |
237 | 258 |
245 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(IMAP_INCS)" | 266 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(IMAP_INCS)" |
246 fi | 267 fi |
247 | 268 |
248 for ngx_src in $IMAP_SRCS | 269 for ngx_src in $IMAP_SRCS |
249 do | 270 do |
250 | |
251 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` | 271 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` |
252 ngx_obj=`echo $ngx_src \ | 272 ngx_obj=`echo $ngx_src \ |
253 | sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \ | 273 | sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \ |
254 -e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \ | 274 -e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \ |
255 -e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \ | 275 -e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \ |
259 | 279 |
260 $ngx_obj: \$(CORE_DEPS) \$(IMAP_DEPS)$ngx_cont$ngx_src | 280 $ngx_obj: \$(CORE_DEPS) \$(IMAP_DEPS)$ngx_cont$ngx_src |
261 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src | 281 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src |
262 | 282 |
263 END | 283 END |
264 | 284 done |
285 | |
286 fi | |
287 | |
288 | |
289 # the addons sources | |
290 | |
291 if test -n "$NGX_ADDON_SRCS"; then | |
292 | |
293 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" | |
294 | |
295 for ngx_src in $NGX_ADDON_SRCS | |
296 do | |
297 ngx_obj="addon/`basename \`dirname $ngx_src\``" | |
298 | |
299 ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \ | |
300 | sed -e "s/\//$ngx_regex_dirsep/g"` | |
301 | |
302 ngx_obj=`echo $ngx_obj \ | |
303 | sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \ | |
304 -e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \ | |
305 -e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \ | |
306 -e "s/^\(.*\.\)S$/$ngx_objs_dir\1$ngx_objext/g"` | |
307 | |
308 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` | |
309 | |
310 cat << END >> $NGX_MAKEFILE | |
311 | |
312 $ngx_obj: \$(ADDON_DEPS)$ngx_cont$ngx_src | |
313 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src | |
314 | |
315 END | |
265 done | 316 done |
266 | 317 |
267 fi | 318 fi |
268 | 319 |
269 | 320 |