summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2014-06-20 07:35:55 +0000
committertijl <tijl@FreeBSD.org>2014-06-20 07:35:55 +0000
commitfb2fa3180cc15f2a89d579be288562ac00171307 (patch)
treee6a23d6cd61a0d607b0bd7ba10efe32a3ff4cc46
parentde4e2206d57bda2268e6b69f09b86ff63cc71f8e (diff)
downloadFreeBSD-src-fb2fa3180cc15f2a89d579be288562ac00171307.zip
FreeBSD-src-fb2fa3180cc15f2a89d579be288562ac00171307.tar.gz
MFC r267441:
Don't install GSS-API headers when the GSSAPI option has been disabled. Some ports assume GSS-API is supported when they find the headers. PR: 189156 Submitted by: Garrett Cooper <yanegomi@gmail.com>
-rw-r--r--include/Makefile9
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc3
2 files changed, 10 insertions, 2 deletions
diff --git a/include/Makefile b/include/Makefile
index 7032450..a0a9cdf 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -6,11 +6,11 @@
.include <bsd.own.mk>
CLEANFILES= osreldate.h version vers.c
-SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale
+SUBDIR= arpa protocols rpcsvc rpc xlocale
INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
db.h \
dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
- fts.h ftw.h getopt.h glob.h grp.h gssapi.h \
+ fts.h ftw.h getopt.h glob.h grp.h \
ieeefp.h ifaddrs.h \
inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \
@@ -68,6 +68,11 @@ _dev_powermac_nvram= dev/powermac_nvram
_dev_ieee488= dev/ieee488
.endif
+.if ${MK_GSSAPI} != "no"
+SUBDIR+= gssapi
+INCS+= gssapi.h
+.endif
+
.if ${MK_HESIOD} != "no"
INCS+= hesiod.h
.endif
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 044941a..ec7d77d 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1773,6 +1773,9 @@ OLD_DIRS+=usr/share/tmac
.endif
.if ${MK_GSSAPI} == no
+OLD_FILES+=usr/include/gssapi/gssapi.h
+OLD_DIRS+=usr/include/gssapi
+OLD_FILES+=usr/include/gssapi.h
OLD_FILES+=usr/lib/libgssapi.a
OLD_FILES+=usr/lib/libgssapi.so
OLD_LIBS+=usr/lib/libgssapi.so.10
OpenPOWER on IntegriCloud