svn commit: r267441 - in head: include tools/build/mk
Tijl Coosemans
tijl at FreeBSD.org
Fri Jun 13 10:08:19 UTC 2014
Author: tijl
Date: Fri Jun 13 10:08:18 2014
New Revision: 267441
URL: http://svnweb.freebsd.org/changeset/base/267441
Log:
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 at gmail.com>
Modified:
head/include/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile Fri Jun 13 08:53:49 2014 (r267440)
+++ head/include/Makefile Fri Jun 13 10:08:18 2014 (r267441)
@@ -6,11 +6,11 @@
.include <src.opts.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 \
@@ -67,6 +67,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
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jun 13 08:53:49 2014 (r267440)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jun 13 10:08:18 2014 (r267441)
@@ -1833,6 +1833,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
More information about the svn-src-head
mailing list