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

diff --git a/STATUS b/STATUS
index f7541feb5dce25491b4cab282553b7f51d4bb89b..cda36eae0cecaa38b9fcf63e2f74a59a0602efc2 100644 (file)
--- 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 ce08405cee2b595e4546abb2e91ad9da8a548e67..0d374744fec7ce66a068dab5892a3fa54758de35 100644 (file)
--- 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 f576f5f5799269927aa293ea5aaa62556368c8c3..fa2eee476285e0aacd8af9692fed4e3691aad8a1 100644 (file)
--- 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])