gunnar: server/apache-php Makefile,1.8,1.9 kolab.patch,1.6,1.7
cvs at kolab.org
cvs at kolab.org
Sat Mar 14 01:45:02 CET 2009
Author: gunnar
Update of /kolabrepository/server/apache-php
In directory doto:/tmp/cvs-serv28530/apache-php
Modified Files:
Makefile kolab.patch
Log Message:
Activated the HASH and JSON modules. Both are required for running Horde 4.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile 9 Feb 2009 10:08:19 -0000 1.8
+++ Makefile 14 Mar 2009 00:44:59 -0000 1.9
@@ -42,7 +42,8 @@
--define 'with_imap yes' --define 'with_ssl yes' --define 'with_ctype yes' \
--define 'with_openldap yes' --define 'with_mhash yes' --define 'with_zlib yes' \
--define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \
- --define 'with_sqlite yes' --define 'with_spl yes'
+ --define 'with_sqlite yes' --define 'with_spl yes' --define 'with_hash yes' \
+ --define 'with_json yes'
cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache-php/kolab.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab.patch 9 Feb 2009 10:08:19 -0000 1.6
+++ kolab.patch 14 Mar 2009 00:44:59 -0000 1.7
@@ -14,10 +14,11 @@
# package options
%option with_suhosin no
-@@ -61,6 +61,7 @@
+@@ -61,6 +61,8 @@
%option with_iconv no
%option with_imap no
%option with_imap_annotate no
++%option with_hash no
+%option with_imap_myrights no
%option with_json no
%option with_mbregex no
@@ -44,10 +45,13 @@
%endif
%build
-@@ -400,11 +400,12 @@
+@@ -400,11 +400,15 @@
%if "%{with_calendar}" == "yes"
--enable-calendar \
%endif
++ %if "%{with_hash}" == "yes"
++ --enable-hash \
++ %endif
- --without-sqlite \
%if "%{with_sqlite}" == "yes"
--with-pdo-sqlite=%{l_prefix} \
More information about the commits
mailing list