diff options
| author | dsainty <dsainty> | 2010-07-28 07:44:50 +0000 |
|---|---|---|
| committer | dsainty <dsainty> | 2010-07-28 07:44:50 +0000 |
| commit | 8f993460ca7167613c7c49ccf29d6a0818fea77d (patch) | |
| tree | 6c93ff7c3eb88c2baa8956725f2a409667b9e9ae | |
| parent | 276fb7dee43f097465515dec53710a5d9ae316fa (diff) | |
| download | pkgsrc-8f993460ca7167613c7c49ccf29d6a0818fea77d.tar.gz | |
Don't specify --with-krb5 if the krb5 option isn't selected, otherwise
the build, understandably, may fail.
If the krb5 option is selected, apply the paths as found in the previous
revision of the Makefile.
Fixes the build under Linux.
| -rw-r--r-- | mail/evolution/Makefile | 6 | ||||
| -rw-r--r-- | mail/evolution/options.mk | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 0691ed7c818..1cd48ae9e14 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.162 2010/07/18 04:50:29 dsainty Exp $ +# $NetBSD: Makefile,v 1.163 2010/07/28 07:44:50 dsainty Exp $ DISTNAME= evolution-2.30.2 CATEGORIES= mail time gnome @@ -23,13 +23,9 @@ REPLACE_PERL+= addressbook/tools/csv2vcard REPLACE_PERL+= addressbook/tools/evolution-addressbook-clean REPLACE_PERL+= addressbook/tools/evolution-addressbook-clean.in -CPPFLAGS+= -I/usr/include/gssapi -CPPFLAGS+= -I/usr/include/krb5 - CONFIGURE_ARGS+= --with-openldap CONFIGURE_ARGS+= --without-static-ldap CONFIGURE_ARGS+= --enable-pilot-conduits=no -CONFIGURE_ARGS+= --with-krb5=/usr .if defined(PKGREVISION) CONFIGURE_ARGS+= --with-sub-version=nb${PKGREVISION} .endif diff --git a/mail/evolution/options.mk b/mail/evolution/options.mk index 36649087218..b82afabf615 100644 --- a/mail/evolution/options.mk +++ b/mail/evolution/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2010/07/28 07:27:54 dsainty Exp $ +# $NetBSD: options.mk,v 1.4 2010/07/28 07:44:50 dsainty Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.evolution PKG_SUPPORTED_OPTIONS= krb5 ssl @@ -15,7 +15,9 @@ PKG_FAIL_REASON+= "Kerberos support conflicts with SSL" .endif .if !empty(PKG_OPTIONS:Mkrb5) -CONFIGURE_ARGS+= --with-krb5 +CPPFLAGS+= -I/usr/include/gssapi +CPPFLAGS+= -I/usr/include/krb5 +CONFIGURE_ARGS+= --with-krb5=/usr . include "../../mk/krb5.buildlink3.mk" .else CONFIGURE_ARGS+= --without-krb5 |