From owner-p4-projects@FreeBSD.ORG  Tue Feb 28 14:00:32 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 0D20716A426; Tue, 28 Feb 2006 14:00:32 +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 A6F5D16A424
	for <perforce@freebsd.org>; Tue, 28 Feb 2006 14:00:31 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6EE1E43D46
	for <perforce@freebsd.org>; Tue, 28 Feb 2006 14:00:31 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1SE0Vae029529
	for <perforce@freebsd.org>; Tue, 28 Feb 2006 14:00:31 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1SE0UlA029526
	for perforce@freebsd.org; Tue, 28 Feb 2006 14:00:30 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 28 Feb 2006 14:00:30 GMT
Message-Id: <200602281400.k1SE0UlA029526@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 92525 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: Tue, 28 Feb 2006 14:00:32 -0000

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

Change 92525 by rwatson@rwatson_peppercorn on 2006/02/28 13:59:39

	Regenerate configure with the right $P4$ from configure.ac update.
	
	Build audit, auditd based on HAVE_AUDIT_SYSCALLS.
	
	Compile and link bsm_wrappers.c and bsm_notify.c into
	HAVE_AUDIT_SYSCALLS based on HAVE_AUDIT_SYSCALLS.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bin/Makefile.am#2 edit
.. //depot/projects/trustedbsd/openbsm/configure#12 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#2 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/bin/Makefile.am#2 (text+ko) ====

@@ -1,10 +1,13 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#1 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#2 $
 #
 
 SUBDIRS =		\
-	audit		\
-	auditd		\
 	auditreduce	\
-	praudit	
+	praudit
 
+if HAVE_AUDIT_SYSCALLS
+SUBDIRS +=		\
+	audit		\
+	auditd
+endif

==== //depot/projects/trustedbsd/openbsm/configure#12 (xtext) ====

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#13 .
+# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#14 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5.
 #

==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#1 $
+# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#2 $
 #
 
 INCLUDES = -I$(top_srcdir)
@@ -14,10 +14,14 @@
 	bsm_flags.c	\
 	bsm_io.c	\
 	bsm_mask.c	\
+	bsm_token.c	\
+	bsm_user.c
+
+if HAVE_AUDIT_SYSCALLS
+libbsm_la_SOURCES +=	\
 	bsm_notify.c	\
-	bsm_token.c	\
-	bsm_user.c	\
 	bsm_wrappers.c
+endif
 
 man3_MANS =		\
 	au_class.3	\