gunnar: server/php Makefile,1.18,1.19 kolab.patch,1.14,1.15
cvs at kolab.org
cvs at kolab.org
Sat Mar 14 01:45:02 CET 2009
Author: gunnar
Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv28530/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/php/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile 9 Feb 2009 10:08:25 -0000 1.18
+++ Makefile 14 Mar 2009 00:45:00 -0000 1.19
@@ -42,7 +42,9 @@
--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)
$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kolab.patch 9 Feb 2009 10:08:25 -0000 1.14
+++ kolab.patch 14 Mar 2009 00:45:00 -0000 1.15
@@ -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
-@@ -396,11 +396,11 @@
+@@ -396,11 +396,14 @@
%if "%{with_calendar}" == "yes"
--enable-calendar \
%endif
++ %if "%{with_hash}" == "yes"
++ --enable-hash \
++ %endif
- --without-sqlite \
+ --without-pdo-sqlite \
%if "%{with_sqlite}" == "yes"
More information about the commits
mailing list