PERFORCE change 92526 for review

Robert Watson rwatson at FreeBSD.org
Tue Feb 28 06:02:38 PST 2006 

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

Change 92526 by rwatson at rwatson_peppercorn on 2006/02/28 14:02:20

	Update for HAVE_AUDIT_SYSCALLS AM_CONDITIONAL() in configure.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/Makefile.in#3 edit
.. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#3 edit
.. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#3 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#3 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#3 edit
.. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#3 edit
.. //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#3 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#3 edit
.. //depot/projects/trustedbsd/openbsm/man/Makefile.in#3 edit
.. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#3 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/Makefile.in#3 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#3 $
 #
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -105,6 +105,8 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@
+HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@

==== //depot/projects/trustedbsd/openbsm/bin/Makefile.in#3 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#3 $
 #
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -39,6 +39,10 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+ at HAVE_AUDIT_SYSCALLS_TRUE@am__append_1 = \
+ at HAVE_AUDIT_SYSCALLS_TRUE@	audit		\
+ at HAVE_AUDIT_SYSCALLS_TRUE@	auditd
+
 subdir = bin
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -58,7 +62,7 @@
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = auditreduce praudit audit auditd
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -89,6 +93,8 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@
+HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -159,12 +165,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = \
-	audit		\
-	auditd		\
-	auditreduce	\
-	praudit	
-
+SUBDIRS = auditreduce praudit $(am__append_1)
 all: all-recursive
 
 .SUFFIXES:

==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#3 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#3 $
 #
 
 srcdir = @srcdir@
@@ -104,6 +104,8 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@
+HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@

==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#3 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#3 $
 #
 
 srcdir = @srcdir@
@@ -104,6 +104,8 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@
+HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@

==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#3 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#3 $
 #
 
 srcdir = @srcdir@
@@ -104,6 +104,8 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@
+HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@

==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#3 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#3 $
 #
 
 srcdir = @srcdir@
@@ -104,6 +104,8 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@
+HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@

==== //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#3 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#3 $
 #
 
 srcdir = @srcdir@
@@ -93,6 +93,8 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@
+HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@

==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#3 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#3 $
 #
 
 srcdir = @srcdir@
@@ -40,6 +40,10 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+ at HAVE_AUDIT_SYSCALLS_TRUE@am__append_1 = \
+ at HAVE_AUDIT_SYSCALLS_TRUE@	bsm_notify.c	\
+ at HAVE_AUDIT_SYSCALLS_TRUE@	bsm_wrappers.c
+
 subdir = libbsm
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -59,9 +63,14 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libbsm_la_LIBADD =
+am__libbsm_la_SOURCES_DIST = bsm_audit.c bsm_class.c bsm_control.c \
+	bsm_event.c bsm_flags.c bsm_io.c bsm_mask.c bsm_token.c \
+	bsm_user.c bsm_notify.c bsm_wrappers.c
+ at HAVE_AUDIT_SYSCALLS_TRUE@am__objects_1 = bsm_notify.lo \
+ at HAVE_AUDIT_SYSCALLS_TRUE@	bsm_wrappers.lo
 am_libbsm_la_OBJECTS = bsm_audit.lo bsm_class.lo bsm_control.lo \
-	bsm_event.lo bsm_flags.lo bsm_io.lo bsm_mask.lo bsm_notify.lo \
-	bsm_token.lo bsm_user.lo bsm_wrappers.lo
+	bsm_event.lo bsm_flags.lo bsm_io.lo bsm_mask.lo bsm_token.lo \
+	bsm_user.lo $(am__objects_1)
 libbsm_la_OBJECTS = $(am_libbsm_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -75,7 +84,7 @@
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libbsm_la_SOURCES)
-DIST_SOURCES = $(libbsm_la_SOURCES)
+DIST_SOURCES = $(am__libbsm_la_SOURCES_DIST)
 man3dir = $(mandir)/man3
 NROFF = nroff
 MANS = $(man3_MANS)
@@ -111,6 +120,8 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@
+HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -183,19 +194,9 @@
 target_alias = @target_alias@
 INCLUDES = -I$(top_srcdir)
 lib_LTLIBRARIES = libbsm.la
-libbsm_la_SOURCES = \
-	bsm_audit.c	\
-	bsm_class.c	\
-	bsm_control.c	\
-	bsm_event.c	\
-	bsm_flags.c	\
-	bsm_io.c	\
-	bsm_mask.c	\
-	bsm_notify.c	\
-	bsm_token.c	\
-	bsm_user.c	\
-	bsm_wrappers.c
-
+libbsm_la_SOURCES = bsm_audit.c bsm_class.c bsm_control.c bsm_event.c \
+	bsm_flags.c bsm_io.c bsm_mask.c bsm_token.c bsm_user.c \
+	$(am__append_1)
 man3_MANS = \
 	au_class.3	\
 	au_control.3	\

==== //depot/projects/trustedbsd/openbsm/man/Makefile.in#3 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#3 $
 #
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -85,6 +85,8 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@
+HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@

==== //depot/projects/trustedbsd/openbsm/tools/Makefile.in#3 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#3 $
 #
 
 srcdir = @srcdir@
@@ -101,6 +101,8 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@
+HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@

More information about the trustedbsd-cvs mailing list