svn commit: r267666 - in stable/10: include tools/build/mk

[Tijl Coosemans]

Author: tijl
Date: Fri Jun 20 07:35:55 2014
New Revision: 267666
URL: http://svnweb.freebsd.org/changeset/base/267666

Log:
  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 at gmail.com>

Modified:
  stable/10/include/Makefile
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/include/Makefile
==============================================================================
--- stable/10/include/Makefile	Fri Jun 20 07:32:03 2014	(r267665)
+++ stable/10/include/Makefile	Fri Jun 20 07:35:55 2014	(r267666)
@@ -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

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Fri Jun 20 07:32:03 2014	(r267665)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Fri Jun 20 07:35:55 2014	(r267666)
@@ -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