summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/Makefile10
-rw-r--r--share/mk/bsd.own.mk1
-rw-r--r--tools/build/options/WITHOUT_KERBEROS5
-rw-r--r--tools/build/options/WITH_GSSAPI4
4 files changed, 19 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile
index dbb26f7..3451703 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -31,7 +31,7 @@ SUBDIR= ${_csu} libc libbsm libcom_err libcrypt libelf libkvm msun libmd \
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 @@ _libbluetooth= libbluetooth
_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
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 4e0491a..d1a89f2 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -381,6 +381,7 @@ MK_${var}:= yes
#
.for var in \
BIND_LIBS \
+ GSSAPI \
HESIOD \
IDEA
.if defined(WITH_${var}) && defined(WITHOUT_${var})
diff --git a/tools/build/options/WITHOUT_KERBEROS b/tools/build/options/WITHOUT_KERBEROS
index 8f562ec..5d86ccf 100644
--- a/tools/build/options/WITHOUT_KERBEROS
+++ b/tools/build/options/WITHOUT_KERBEROS
@@ -1,2 +1,7 @@
.\" $FreeBSD$
Set this if you do not want to build Kerberos 5 (KTH Heimdal).
+This option implies
+.Va WITHOUT_GSSAPI .
+Set
+.Va WITH_GSSAPI
+to override.
diff --git a/tools/build/options/WITH_GSSAPI b/tools/build/options/WITH_GSSAPI
new file mode 100644
index 0000000..77d9cde
--- /dev/null
+++ b/tools/build/options/WITH_GSSAPI
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to build libgssapi when
+.Va WITHOUT_KERBEROS
+is set.
OpenPOWER on IntegriCloud