[pkgsrc/trunk]: pkgsrc/mail/fetchmail Correct handling if gssapi and kerberos...

[frueauf <frueauf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ed3fd92fa8c
branches:  trunk
changeset: 494797:7ed3fd92fa8c
user:      frueauf <frueauf%pkgsrc.org@localhost>
date:      Mon May 30 18:06:37 2005 +0000

description:
Correct handling if gssapi and kerberos is defined. Proposal by
Dieter Baron, tested by Jukka Salmi.

diffstat:

 mail/fetchmail/options.mk |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r dc074daaa109 -r 7ed3fd92fa8c mail/fetchmail/options.mk
--- a/mail/fetchmail/options.mk Mon May 30 16:58:46 2005 +0000
+++ b/mail/fetchmail/options.mk Mon May 30 18:06:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2005/05/30 14:02:17 frueauf Exp $
+# $NetBSD: options.mk,v 1.11 2005/05/30 18:06:37 frueauf Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.fetchmail
 PKG_SUPPORTED_OPTIONS= inet6 kerberos4 kerberos gssapi ssl
@@ -17,8 +17,7 @@
 ###
 ### Authentication via GSSAPI (currently only over Kerberos V) support.
 ###
-.if !empty(PKG_OPTIONS:Mgssapi) && empty(PKG_OPTIONS:Mkerberos)
-PKG_OPTIONS+=          kerberos
+.if !empty(PKG_OPTIONS:Mgssapi)
 CONFIGURE_ARGS+=       --with-gssapi=${KRB5BASE}
 .else
 CONFIGURE_ARGS+=       --with-gssapi=no
@@ -40,7 +39,7 @@
 ###
 ### Kerberos V support.
 ###
-.if !empty(PKG_OPTIONS:Mkerberos)
+.if !empty(PKG_OPTIONS:Mkerberos) || !empty(PKG_OPTIONS:Mgssapi)
 .  include "../../mk/krb5.buildlink3.mk"
 PKG_USE_KERBEROS=      # defined
 CONFIGURE_ARGS+=        --with-kerberos5=${KRB5BASE}