Should libgssapi be hidden behind the MK_KERBEROS knob?

[Doug Barton]

Gordon M Tetlow wrote:
> 
> On Dec 8, 2007, at 8:38 AM, Brooks Davis wrote:
> 
>> On Fri, Dec 07, 2007 at 03:49:28PM -0800, Doug Barton wrote:
>>> If there is a better list for this, don't hesitate to let me know.
>>>
>>> I use WITHOUT_KERBEROS=true in /etc/{make|src}.conf, since I don't
>>> need or use it. However, this leads to a problem with building the
>>> kdelibs3 port. The configure script looks for the presence of
>>> libgssapi and the associated headers, and takes that to mean that
>>> kerberos is available, and sets things up accordingly. This causes
>>> the build to fail when it tries to actually link something to a
>>> kerberos library.
>>>
>>> I realize that GSS can be used for other things besides kerberos, but
>>> are we really losing anything by hiding them both under the same knob?
>>> If the answer to that is yes, is there any objection to a WITHOUT_GSS
>>> knob?
>>
>> We wouldn't loose anything today, but a without GSS knob makes more
>> sense to me.  There's at least one other GSS system in fairly wide use
>> in the high performance computing world today.
> 
> How about WITHOUT_KERBEROS implies WITHOUT_GSSAPI unless people
> specifically ask for GSSAPI? Is that too obscure?

That sounds totally reasonable. How does the attached look?

Doug

-- 

    This .signature sanitized for your protection

-------------- next part --------------
Index: lib/Makefile
===================================================================
RCS file: /usr/local/ncvs/src/lib/Makefile,v
retrieving revision 1.226
diff -u -r1.226 Makefile
--- lib/Makefile	17 Nov 2007 21:29:02 -0000	1.226
+++ lib/Makefile	8 Dec 2007 23:24:47 -0000
@@ -31,7 +31,7 @@
 	libbegemot ${_libbluetooth} libbsnmp libbz2 \
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
 	libedit libexpat libfetch libftpio libgeom ${_libgpib} \
-	libgssapi libipsec \
+	${_libgssapi} libipsec \
 	${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \
 	${_libncp} ${_libngatm} libopie libpam libpcap \
 	libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \
@@ -62,6 +62,14 @@
 _libsdp=	libsdp
 .endif
 
+.if ${MK_KERBEROS} != "no"
+_libgssapi=	libgssapi
+.else
+.if ${MK_GSSAPI} = "yes"
+_libgssapi=	libgssapi
+.endif
+.endif
+
 .if ${MK_IPX} != "no"
 _libipx=	libipx
 .endif
Index: share/man/man5/src.conf.5
===================================================================
RCS file: /usr/local/ncvs/src/share/man/man5/src.conf.5,v
retrieving revision 1.20
diff -u -r1.20 src.conf.5
--- share/man/man5/src.conf.5	19 Oct 2007 14:03:05 -0000	1.20
+++ share/man/man5/src.conf.5	8 Dec 2007 23:40:23 -0000
@@ -288,6 +288,10 @@
 .\" from FreeBSD: src/tools/build/options/WITHOUT_GROFF,v 1.1 2006/03/21 07:50:49 ru Exp
 Set to not build
 .Xr groff 1 .
+.It Va WITH_GSSAPI
+Set to build libgssapi when
+.Va WITHOUT_KERBEROS
+is set.
 .It Va WITH_HESIOD
 .\" from FreeBSD: src/tools/build/options/WITH_HESIOD,v 1.1 2006/03/21 07:50:50 ru Exp
 Set to build Hesiod support.
@@ -347,6 +351,10 @@
 .Bl -item -compact
 .It
 .Va WITHOUT_KERBEROS_SUPPORT
+.It
+.Va WITHOUT_GSSAPI
+(unless overridden by
+.Va WITH_GSSAPI )
 .El
 .It Va WITHOUT_KERBEROS_SUPPORT
 .\" from FreeBSD: src/tools/build/options/WITHOUT_KERBEROS_SUPPORT,v 1.1 2006/03/21 07:50:50 ru Exp
Index: share/mk/bsd.own.mk
===================================================================
RCS file: /usr/local/ncvs/src/share/mk/bsd.own.mk,v
retrieving revision 1.69
diff -u -r1.69 bsd.own.mk
--- share/mk/bsd.own.mk	20 Oct 2007 19:01:49 -0000	1.69
+++ share/mk/bsd.own.mk	8 Dec 2007 23:29:05 -0000
@@ -381,6 +381,7 @@
 #
 .for var in \
     BIND_LIBS \
+    GSSAPI \
     HESIOD \
     IDEA
 .if defined(WITH_${var}) && defined(WITHOUT_${var})