misc mod_*cache cleanups and additions

apache2/apache2.spec

@@ -30,7 +30,7 @@
 
 #   package information
 Name:         apache2
-Summary:      Apache Webserver (V2)
+Summary:      Apache HTTP Server (V2)
 URL:          http://httpd.apache.org/
 Vendor:       Apache Software Foundation
 Packager:     OpenPKG
@@ -56,12 +56,19 @@ Release:      20060821
 %option       with_mod_ldap             no
 %option       with_mod_proxy            no
 %option       with_mod_cache            no
+%option       with_mod_diskcache        no
 %option       with_mod_memcache         no
 %option       with_mod_filecache        no
 %option       with_mod_expires          no
 %option       with_mod_perl             no
 %option       with_shared_core          no
 
+#   fixing implicit inter-module dependencies and correlations
+%if "%{with_mod_memcache}" == "yes" || "%{with_mod_diskcache}" == "yes"
+%undefine     with_mod_cache
+%define       with_mod_cache            yes
+%endif
+
 #   list of sources
 Source0:      http://www.apache.org/dist/httpd/httpd-%{V_apache}.tar.gz
 Source1:      http://perl.apache.org/dist/mod_perl-%{V_mod_perl}.tar.gz
@@ -186,6 +193,11 @@ Conflicts:    apache
       case "%{l_platform -t}" in
           *-sunos* ) LIBS="$LIBS -lrt" ;;
       esac
+%if "%{with_mpm}" == "worker" || "%{with_mod_memcache}" == "yes"
+      THREADS="--enable-threads"
+%else
+      THREADS="--disable-threads"
+%endif
 %if "%{with_mod_ldap}" == "yes"
       LIBS="$LIBS -lssl -lcrypto"
 %endif
@@ -198,10 +210,7 @@ Conflicts:    apache
           --sysconfdir=%{l_prefix}/etc/apache2 \
           --libexecdir=%{l_prefix}/libexec/apache2 \
           --with-mpm=%{with_mpm} \
-          --disable-threads \
-%if "%{with_mpm}" == "worker"
-          --enable-threads \
-%endif
+          $THREADS \
 %if "%{with_suexec}" == "yes"
           --enable-suexec \
           --with-suexec-bin=%{l_prefix}/sbin/suexec \
@@ -236,11 +245,13 @@ Conflicts:    apache
 %endif
 %if "%{with_mod_cache}" == "yes"
           --enable-cache \
+%if "%{with_mod_diskcache}" == "yes"
+          --enable-disk-cache \
 %endif
 %if "%{with_mod_memcache}" == "yes"
-          --enable-threads \
           --enable-mem-cache \
 %endif
+%endif
 %if "%{with_mod_filecache}" == "yes"
           --enable-file-cache \
 %endif