diff options
Diffstat (limited to '')
| -rw-r--r-- | auto/cc/msvc | 24 | ||||
| -rw-r--r-- | auto/make | 2 | ||||
| -rw-r--r-- | auto/modules | 5 | ||||
| -rw-r--r-- | auto/options | 3 | ||||
| -rw-r--r-- | auto/sources | 4 |
5 files changed, 28 insertions, 10 deletions
diff --git a/auto/cc/msvc b/auto/cc/msvc index 2f1e8bcd5..5c8acc1b1 100644 --- a/auto/cc/msvc +++ b/auto/cc/msvc @@ -116,19 +116,25 @@ ngx_binout="-Fe" ngx_objext="obj" ngx_binext=".exe" -# Borland make -#ngx_long_start='@&&| -# ' -#ngx_long_end='|' +if [ "$BMAKE" = nmake ]; then + # MS nmake -# MS nmake -ngx_long_start='@<< + ngx_long_start='@<< ' -ngx_long_end='<<' -ngx_long_regex_cont=' \ + ngx_long_end='<<' + ngx_long_regex_cont=' \ ' -ngx_long_cont=' + ngx_long_cont=' ' + +else + # Borland make + + ngx_long_start='@&&| + ' + ngx_long_end='|' +fi + # MSVC understand / in path #ngx_regex_dirsep='\\' #ngx_dirsep="\\" @@ -22,7 +22,7 @@ LINK = $LINK END -if [ "$CC" = wcl386 ]; then +if [ "$BMAKE" = wmake ]; then echo MAKE = wmake >> $NGX_MAKEFILE ngx_regex_cont=' ' diff --git a/auto/modules b/auto/modules index 56dad56de..670404649 100644 --- a/auto/modules +++ b/auto/modules @@ -127,6 +127,11 @@ fi HTTP_MODULES="$HTTP_MODULES $HTTP_STATIC_MODULE" +if [ $HTTP_DAV = YES ]; then + HTTP_MODULES="$HTTP_MODULES $HTTP_DAV_MODULE" + HTTP_SRCS="$HTTP_SRCS $HTTP_DAV_SRCS" +fi + if [ $HTTP_AUTOINDEX = YES ]; then have=NGX_HTTP_AUTOINDEX . auto/have HTTP_MODULES="$HTTP_MODULES $HTTP_AUTOINDEX_MODULE" diff --git a/auto/options b/auto/options index f80b5fc14..bece290d5 100644 --- a/auto/options +++ b/auto/options @@ -53,6 +53,7 @@ HTTP_SSI=YES HTTP_POSTPONE=NO HTTP_REALIP=NO HTTP_ADDITION=NO +HTTP_DAV=NO HTTP_ACCESS=YES HTTP_AUTH_BASIC=YES HTTP_USERID=YES @@ -141,6 +142,8 @@ do --with-http_ssl_module) HTTP_SSL=YES ;; --with-http_realip_module) HTTP_REALIP=YES ;; --with-http_addition_module) HTTP_ADDITION=YES ;; + --with-http_dav_module) HTTP_DAV=YES ;; + --without-http_charset_module) HTTP_CHARSET=NO ;; --without-http_gzip_module) HTTP_GZIP=NO ;; --without-http_ssi_module) HTTP_SSI=NO ;; diff --git a/auto/sources b/auto/sources index 4731f4878..bcb71f3eb 100644 --- a/auto/sources +++ b/auto/sources @@ -323,6 +323,10 @@ HTTP_ADDITION_FILTER_MODULE=ngx_http_addition_filter_module HTTP_ADDITION_SRCS=src/http/modules/ngx_http_addition_filter_module.c +HTTP_DAV_MODULE=ngx_http_dav_module +HTTP_DAV_SRCS=src/http/modules/ngx_http_dav_module.c + + HTTP_ACCESS_MODULE=ngx_http_access_module HTTP_ACCESS_SRCS=src/http/modules/ngx_http_access_module.c |