From 51f7b90edac4f99370f8e2f87fbba6ad5df0839e Mon Sep 17 00:00:00 2001 From: "Victor J. Orlikowski" Date: Tue, 31 Jul 2001 19:21:51 +0000 Subject: [PATCH] Get dav_fs to follow options for dav. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89839 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 3 +-- modules/dav/fs/config6.m4 | 6 +++--- modules/dav/main/config5.m4 | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/STATUS b/STATUS index f7541feb5d..cda36eae0c 100644 --- a/STATUS +++ b/STATUS @@ -1,5 +1,5 @@ APACHE 2.0 STATUS: -*-text-*- -Last modified at [$Date: 2001/07/30 14:01:07 $] +Last modified at [$Date: 2001/07/31 19:21:50 $] Release: @@ -257,7 +257,6 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: (use the new canonical name stuff?) - find a new home for ap_text(_header) - is it possible to remove the DAV: namespace stuff from util_xml? - - mod_dav_fs gets built static when mods-shared=most is specified. * ap_core_translate() and its use by mod_mmap_static and mod_file_cache are a bit wonky. The function should probably be exposed as a utility diff --git a/modules/dav/fs/config6.m4 b/modules/dav/fs/config6.m4 index ce08405cee..0d374744fe 100644 --- a/modules/dav/fs/config6.m4 +++ b/modules/dav/fs/config6.m4 @@ -4,10 +4,10 @@ APACHE_MODPATH_INIT(dav/fs) dav_fs_objects="mod_dav_fs.lo dbm.lo lock.lo repos.lo" -if test "$enable_dav" = "no"; then - dav_fs_enable=no +if test "$enable_dav" != ""; then + dav_fs_enable=$enable_dav else - dav_fs_enable="$enable_dav" + dav_fs_enable=$dav_enable fi APACHE_MODULE(dav_fs, DAV provider for the filesystem, $dav_fs_objects, , $dav_fs_enable) diff --git a/modules/dav/main/config5.m4 b/modules/dav/main/config5.m4 index f576f5f579..fa2eee4762 100644 --- a/modules/dav/main/config5.m4 +++ b/modules/dav/main/config5.m4 @@ -12,7 +12,7 @@ fi APACHE_MODULE(dav, WebDAV protocol handling, $dav_objects, , $dav_enable) -if test "$enable_dav" != "no"; then +if test "$dav_enable" != "no" -o "$enable_dav" != "no"; then apache_need_expat=yes APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current]) -- 2.40.0