From owner-p4-projects@FreeBSD.ORG  Fri Feb 10 15:27:45 2006
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 8E92016A424; Fri, 10 Feb 2006 15:27:44 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4F7AE16A420
	for <perforce@freebsd.org>; Fri, 10 Feb 2006 15:27:44 +0000 (GMT)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1F13B43D45
	for <perforce@freebsd.org>; Fri, 10 Feb 2006 15:27:44 +0000 (GMT)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1AFRi6H018862
	for <perforce@freebsd.org>; Fri, 10 Feb 2006 15:27:44 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1AFRhur018859
	for perforce@freebsd.org; Fri, 10 Feb 2006 15:27:43 GMT
	(envelope-from csjp@freebsd.org)
Date: Fri, 10 Feb 2006 15:27:43 GMT
Message-Id: <200602101527.k1AFRhur018859@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 91502 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, 10 Feb 2006 15:27:45 -0000

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

Change 91502 by csjp@csjp_xor on 2006/02/10 15:27:11

	- Move unconditional LDADD into NO_AUDIT
	- Add a DPADD variable ${LIBBS}
	
	Spotted by:	rwatson

Affected files ...

.. //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#9 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#9 (text+ko) ====

@@ -5,7 +5,7 @@
 SRCS=	login.c login_audit.c login_fbtab.c
 CFLAGS+=-DLOGALL
 DPADD=	${LIBUTIL} ${LIBPAM}
-LDADD=	-lutil ${MINUSLPAM} -lbsm
+LDADD=	-lutil ${MINUSLPAM} 
 MAN=	login.1 login.access.5
 
 .if !defined(NO_SETUID_LOGIN)
@@ -15,6 +15,8 @@
 .endif
 
 .if !defined(NO_AUDIT)
+DPADD+= ${LIBBSM}
+LDADD+= -lbsm
 CFLAGS += -DUSE_BSM_AUDIT
 .endif