Author: tijl
Date: Mon Jul 14 11:07:43 2014
New Revision: 268618
URL: http://svnweb.freebsd.org/changeset/base/268618
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 <yaneg...@gmail.com>
Modified:
stable/9/include/Makefile
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/ (props changed)
stable/9/include/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/include/Makefile
==============================================================================
--- stable/9/include/Makefile Mon Jul 14 09:52:33 2014 (r268617)
+++ stable/9/include/Makefile Mon Jul 14 11:07:43 2014 (r268618)
@@ -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/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Mon Jul 14 09:52:33
2014 (r268617)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Mon Jul 14 11:07:43
2014 (r268618)
@@ -1976,6 +1976,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
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
