From owner-p4-projects@FreeBSD.ORG  Fri Apr 20 21:16:54 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B353716A407; Fri, 20 Apr 2007 21:16:54 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7F69E16A402
	for <perforce@freebsd.org>; Fri, 20 Apr 2007 21:16:54 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 6F6D913C4B0
	for <perforce@freebsd.org>; Fri, 20 Apr 2007 21:16:54 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3KLGsP5033228
	for <perforce@freebsd.org>; Fri, 20 Apr 2007 21:16:54 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KLGsBk033225
	for perforce@freebsd.org; Fri, 20 Apr 2007 21:16:54 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 20 Apr 2007 21:16:54 GMT
Message-Id: <200704202116.l3KLGsBk033225@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 118498 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 21:16:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=118498

Change 118498 by peter@peter_daintree on 2007/04/20 21:16:02

	Exclude gssapi.h includes when kerberos is turned off.  This is
	because libgss* is part of the kerberos build.  If we let the
	includes be installed, then certain autoconf scripts will "detect"
	gssapi when the backing libraries do not exist.

Affected files ...

.. //depot/projects/hammer/include/Makefile#60 edit

Differences ...

==== //depot/projects/hammer/include/Makefile#60 (text+ko) ====

@@ -6,11 +6,12 @@
 .include <bsd.own.mk>
 
 CLEANFILES= osreldate.h version vers.c
-SUBDIR= arpa gssapi protocols rpcsvc rpc
+SUBDIR= arpa ${_gssapi} protocols rpcsvc rpc
 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 float.h floatingpoint.h \
-	fmtmsg.h fnmatch.h fstab.h fts.h ftw.h getopt.h glob.h grp.h gssapi.h \
+	fmtmsg.h fnmatch.h fstab.h fts.h ftw.h getopt.h glob.h grp.h \
+	${_gssapi_h} \
 	histedit.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 \
@@ -78,6 +79,11 @@
 _fs_nwfs=	fs/nwfs
 .endif
 
+.if ${MK_KERBEROS} != "no"
+_gssapi=	gssapi
+_gssapi_h=	gssapi.h
+.endif
+
 # Define SHARED to indicate whether you want symbolic links to the system
 # source (``symlinks''), or a separate copy (``copies'').  ``symlinks'' is
 # probably only useful for developers and should be avoided if you do not