thomas: server/php Makefile,1.18.2.4,1.18.2.5

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv1296/php

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Correct requirements for php and apache-php:

- hash and tokenizer are not supported in this version
- spl is activated by kolabd requirements, so workaround in install-kolab.sh
  is no longer needed.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.18.2.4
retrieving revision 1.18.2.5
diff -u -d -r1.18.2.4 -r1.18.2.5
--- Makefile	21 Apr 2010 14:53:18 -0000	1.18.2.4
+++ Makefile	24 Jun 2010 10:27:01 -0000	1.18.2.5
@@ -26,8 +26,7 @@
 	--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_hash yes' \
-	--define 'with_json yes' --define 'with_tokenizer yes'
+	--define 'with_sqlite yes' --define 'with_spl yes' --define 'with_json yes'
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(CURSRCDIR)
 
 $(PACKAGE)-$(OLD_VERSION)-$(RELEASE).src.rpm: