added optional modules cache, mem-cache and expires. mem-cache needs enable-threads

apache2/apache2.spec

@@ -39,7 +39,7 @@ Class:        PLUS
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20060728
+Release:      20060821
 
 #   package options (generic)
 %option       with_mpm                  prefork
@@ -55,7 +55,10 @@ Release:      20060728
 %option       with_mod_dav              no
 %option       with_mod_ldap             no
 %option       with_mod_proxy            no
+%option       with_mod_cache            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
 
@@ -195,10 +198,9 @@ Conflicts:    apache
           --sysconfdir=%{l_prefix}/etc/apache2 \
           --libexecdir=%{l_prefix}/libexec/apache2 \
           --with-mpm=%{with_mpm} \
+          --disable-threads \
 %if "%{with_mpm}" == "worker"
           --enable-threads \
-%else
-          --disable-threads \
 %endif
 %if "%{with_suexec}" == "yes"
           --enable-suexec \
@@ -232,9 +234,19 @@ Conflicts:    apache
           --enable-proxy-http \
           --enable-proxy-ftp \
 %endif
+%if "%{with_mod_cache}" == "yes"
+          --enable-cache \
+%endif
+%if "%{with_mod_memcache}" == "yes"
+          --enable-threads \
+          --enable-mem-cache \
+%endif
 %if "%{with_mod_filecache}" == "yes"
           --enable-file-cache \
 %endif
+%if "%{with_mod_expires}" == "yes"
+          --enable-expires \
+%endif
 %if "%{with_shared_core}" == "yes"
           --enable-so \
 %endif