OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Aug-2006 15:46:07
Branch: HEAD Handle: 2006082114460700
Modified files:
openpkg-src/apache2 apache2.spec
Log:
misc mod_*cache cleanups and additions
Summary:
Revision Changes Path
1.78 +17 -6 openpkg-src/apache2/apache2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.spec
============================================================================
$ cvs diff -u -r1.77 -r1.78 apache2.spec
--- openpkg-src/apache2/apache2.spec 21 Aug 2006 12:31:00 -0000 1.77
+++ openpkg-src/apache2/apache2.spec 21 Aug 2006 13:46:07 -0000 1.78
@@ -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 @@
%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 @@
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 @@
--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 @@
%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
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
