apache2: provide sub dependency DAV

(cherry-picked from commit 9b6731116537c91630dade2f0e3422067d23859f)

6 files changed, 27 insertions, 1 deletions

diff --git a/http/apache2/BUILD b/http/apache2/BUILD
index 93d01a6b05..57d9a73d79 100755
--- a/http/apache2/BUILD
+++ b/http/apache2/BUILD
@@ -13,5 +13,5 @@ cp -f $SCRIPT_DIRECTORY/config.layout $SOURCE_DIRECTORY &&
              --mandir=$INSTALL_ROOT/usr/share/man  \
       --enable-layout=SMGL                         \
      --enable-modules=most                         \
-                      $OPTS                        &&
+                      $OPTS $APACHE22_EXTRA        &&
 make
diff --git a/http/apache2/CONFIGURE b/http/apache2/CONFIGURE
index 2a730979a0..6637c349ad 100755
--- a/http/apache2/CONFIGURE
+++ b/http/apache2/CONFIGURE
@@ -8,6 +8,9 @@
 # * mod_isapi   (win32 only)
 # * mod_nw_ssl  (netware only)
 
+# extra options, for sub dependencies
+persistent_add APACHE22_EXTRA
+APACHE22_EXTRA=
 
 basic_config() {
   # Perform any configuration in here that doesn't involve modules
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index 805c8eb249..3c08dd8390 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,3 +1,7 @@
+2008-08-20 Thomas Orgis <sobukus@sourcemage.org>
+        * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^none^PRE_SUB_DEPENDS:
+          provide DAV sub dependency for mod_dav
+
 2008-05-27 Remko van der Vossen <wich@sourcemage.org>
 	* CONFLICTS: conflict with xshttpd if that is compiled without prefix
 
diff --git a/http/apache2/PRE_SUB_DEPENDS b/http/apache2/PRE_SUB_DEPENDS
new file mode 100644
index 0000000000..7dde420468
--- /dev/null
+++ b/http/apache2/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+    DAV) list_find "$OPTS $APACHE22_EXTRA" --enable-dav && return 0 ;;
+      *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/http/apache2/REPAIR^none^PRE_SUB_DEPENDS b/http/apache2/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100644
index 0000000000..7dde420468
--- /dev/null
+++ b/http/apache2/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+    DAV) list_find "$OPTS $APACHE22_EXTRA" --enable-dav && return 0 ;;
+      *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/http/apache2/SUB_DEPENDS b/http/apache2/SUB_DEPENDS
new file mode 100644
index 0000000000..a1cd21585e
--- /dev/null
+++ b/http/apache2/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+  DAV)
+    message "${MESSAGE_COLOR}Forcing DAV module as sub dependency.$DEFAULT_COLOR" &&
+    APACHE22_EXTRA="$APACHE22_EXTRA --enable-dav"
+  ;;
+    *) echo "unknown sub_depends $THIS_SUB_DEPENDS"; return 1 ;;
+esac