diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-09-20 07:39:10 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-09-20 07:39:10 +0800 |
| commit | 3f736810f8d63c4369e83d93695e6dec7a46307d (patch) | |
| tree | f4f527bdda843893066e0f6d6cdca7b05125cc46 | |
| parent | 8f10c102fcebe7ac1d6ea0494b830e857616dbaa (diff) | |
| download | marcuscom-ports-3f736810f8d63c4369e83d93695e6dec7a46307d.tar marcuscom-ports-3f736810f8d63c4369e83d93695e6dec7a46307d.tar.gz marcuscom-ports-3f736810f8d63c4369e83d93695e6dec7a46307d.tar.bz2 marcuscom-ports-3f736810f8d63c4369e83d93695e6dec7a46307d.tar.lz marcuscom-ports-3f736810f8d63c4369e83d93695e6dec7a46307d.tar.xz marcuscom-ports-3f736810f8d63c4369e83d93695e6dec7a46307d.tar.zst marcuscom-ports-3f736810f8d63c4369e83d93695e6dec7a46307d.zip | |
Fix build if NO_KERBEROS is defined
Reported by: miwi
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9689 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | databases/evolution-data-server/Makefile | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index acdead213..2389402bf 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.125 2007/09/03 17:45:59 mezz Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.126 2007/09/17 17:53:01 marcus Exp $ # PORTNAME= evolution-data-server @@ -34,7 +34,6 @@ USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static \ --enable-nss=yes \ --with-openldap=yes \ - --with-krb5=/usr \ --with-libdb=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" @@ -49,16 +48,12 @@ OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libedataserver_e-msgport.c .endif -.if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \ - exists(/usr/lib/libkrb5.so) -CONFIGURE_ARGS+= --with-krb5=/usr -.else +.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) +HEIMDAL_HOME?= ${LOCALBASE} LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal -.if defined(HEIMDAL_HOME) CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include -.else -CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} -.endif +.elif !defined(NO_KERBEROS) +CONFIGURE_ARGS+= --with-krb5=/usr .endif .if defined(WITH_IMAP4) || defined(PACKAGE_BUILDING) |