thomas: server/kolabd Makefile,1.13,1.14

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/kolabd
In directory doto:/tmp/cvs-serv11881/kolabd

Modified Files:
	Makefile 
Log Message:
* kolabd.spec.in, templates/slapd.conf.template.in: Removed "with_horde" option:

Always disable the horde schema (since prefs are stored in files now), but
compile php/apache-php with all dependencies needed by horde. This will fix
kolab/issue2440 (Installing binary packages of 2.2-beta3 fails without -H),
too.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolabd/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	20 Jun 2008 17:10:25 -0000	1.13
+++ Makefile	11 Dec 2008 16:56:52 -0000	1.14
@@ -22,7 +22,7 @@
 	cd $(PACKAGE) && ./bootstrap && ./configure --prefix=/kolab --enable-dist=kolab \
 		&& make clean distcheck && mv $(PACKAGE)-$(VERSION).tar.bz2 $(KOLABRPMSRC)/$(PACKAGE)
 	cp $(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'kolab_version CVS' --define 'with_horde yes'
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'kolab_version CVS'
 
 binary:
 	$(RPM) -bB $(PACKAGE).spec