summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2010-06-24 10:27:01 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2010-06-24 10:27:01 (GMT)
commite2417d22b30acee20f20a5f615b4f619a5ed523b (patch)
tree05eda84301a5e13bae95a2f1809b042d45468538
parenta2b64c1d35e2fdabb01bb3507448c9e10e71a227 (diff)
downloadserver-e2417d22b30acee20f20a5f615b4f619a5ed523b.tar.gz
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.
-rw-r--r--apache-php/Makefile3
-rwxr-xr-xinstall-kolab.sh2
-rw-r--r--php/Makefile3
3 files changed, 3 insertions, 5 deletions
diff --git a/apache-php/Makefile b/apache-php/Makefile
index 07f6190..54cde3d 100644
--- a/apache-php/Makefile
+++ b/apache-php/Makefile
@@ -26,8 +26,7 @@ $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$
--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)
diff --git a/install-kolab.sh b/install-kolab.sh
index 70976dc..5d0055f 100755
--- a/install-kolab.sh
+++ b/install-kolab.sh
@@ -20,7 +20,7 @@ USER=""
PREFIX=""
PACKAGES="openpkg-tools openldap postfix kolabd kolab-webadmin kolab-fbview kolab-webclient"
-DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps -D apache-php::with_spl"
+DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps"
EXCLUDEPKGS=""
#Flags
diff --git a/php/Makefile b/php/Makefile
index ed7db7b..31157ba 100644
--- a/php/Makefile
+++ b/php/Makefile
@@ -26,8 +26,7 @@ $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$
--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: