From b5107437acf897ecad78a66aa6df13466b57ff1a Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 6 Jul 2005 18:22:17 +0000 Subject: Remove WITHOUT_LDAP and always have LDAP enable. The WITHOUT_LDAP gains nothing, but cause problems for the other apps that depend on this port. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4193 df743ca5-7f9a-e211-a948-0013205c9059 --- databases/evolution-data-server/Makefile | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'databases/evolution-data-server/Makefile') diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 19049ff9f..a0ae99108 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.48 2005/07/01 17:55:37 marcus Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.49 2005/07/03 22:19:35 kwm Exp $ # PORTNAME= evolution-data-server @@ -25,11 +25,13 @@ USE_GMAKE= yes USE_BISON= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnomeui +USE_OPENLDAP= yes USE_REINPLACE= yes USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-static \ --enable-nss=yes \ + --with-openldap=yes \ --with-nss-includes=${LOCALBASE}/include/nss/nss \ --with-nss-libs=${LOCALBASE}/lib \ --with-nspr-includes=${LOCALBASE}/include/nspr \ @@ -46,13 +48,6 @@ PLIST_SUB= VERSION="1.4" EVO_VERSION="1.2" EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libedataserver_e-msgport.c .endif -.if !defined(WITHOUT_LDAP) -USE_OPENLDAP= yes -CONFIGURE_ARGS+=--with-openldap=yes -.else -CONFIGURE_ARGS+=--with-openldap=no -.endif - .if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \ exists(/usr/lib/libkrb5.so) CONFIGURE_ARGS+= --with-krb5=/usr @@ -65,10 +60,4 @@ CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} .endif .endif -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "evolution-data-server has the following configurable option(s):" - @${ECHO_MSG} " WITHOUT_LDAP Disable LDAP support" - @${ECHO_MSG} "" - .include -- cgit v1.2.3