PERFORCE change 92525 for review

Robert Watson rwatson at FreeBSD.org
Tue Feb 28 06:00:45 PST 2006


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

Change 92525 by rwatson at 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	\


More information about the trustedbsd-cvs mailing list