Make the dav/main config.m4 file be added to the configure script after

httpd, and make dav default to no if http is not enabled.  Dav still
defaults to yes if http is in the server.  Dav is incredibly HTTP centric,
and makes little to no sense without HTTP

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88827 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/dav/main/config.m4 b/modules/dav/main/config5.m4
similarity index 67%
rename from modules/dav/main/config.m4
rename to modules/dav/main/config5.m4
index 996cf580e80cc93f5948c0e3f7738b40f7e15a8b..bf435023ffe01bda6a8d1badc720ba919fde8535 100644 (file)
--- a/modules/dav/main/config.m4
+++ b/modules/dav/main/config5.m4
@@ -4,7 +4,13 @@ APACHE_MODPATH_INIT(dav/main)
 
 dav_objects="mod_dav.lo props.lo util.lo util_lock.lo liveprop.lo providers.lo std_liveprop.lo"
 
-APACHE_MODULE(dav, WebDAV protocol handling, $dav_objects, , most)
+if test "$enable_http" = "no"; then
+  dav_enable=no
+else
+  dav_enable=most
+fi
+
+APACHE_MODULE(dav, WebDAV protocol handling, $dav_objects, , $dav_enable)
 
 if test "$enable_dav" != "no"; then
   apache_need_expat=yes