PERFORCE change 68051 for review

[Tom Rhodes]

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

Change 68051 by trhodes at trhodes_local on 2004/12/31 23:32:52

	Add NO_AUDIT option
	<enter description here>

Affected files ...

.. //depot/projects/trustedbsd/audit3/lib/Makefile#4 edit
.. //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#4 edit
.. //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#3 edit
.. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#6 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/lib/Makefile#4 (text+ko) ====

@@ -47,7 +47,7 @@
 _libngatm=	libngatm
 .endif
 
-.if !defined(NOAUDIT)
+.if !defined(NO_AUDIT)
 _libbsm=	libbsm
 .endif
 

==== //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#4 (text+ko) ====

@@ -110,6 +110,7 @@
 # To avoid building various parts of the base system:
 #NO_ACPI=		# do not build acpiconf(8) and related programs
 #NOATM=			# do not build ATM related programs and libraries
+#NO_AUDIT= 		# do not build audit libraries or utilities
 #NO_AUTHPF=		# do not build and install authpf (setuid/gid)
 #NO_BLUETOOTH=		# do not build Bluetooth related stuff
 #NO_BOOT=		# do not build boot blocks and loader

==== //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#3 (text+ko) ====

@@ -410,6 +410,9 @@
 .It Va MODULES_WITH_WORLD
 .Pq Vt bool
 Set to build modules with the system instead of the kernel.
+.It Va NO_AUDIT
+.Pq Vt bool
+Set to not build audit utilities and libraries.
 .It Va NO_BLUETOOTH
 .Pq Vt bool
 Set to not build Bluetooth related kernel modules, programs and libraries.

==== //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#6 (text+ko) ====

@@ -12,9 +12,9 @@
 	${_apmd} \
 	${_arlcontrol} \
 	arp \
-	audit \
-	auditd \
-	auditon \
+	${_audit} \
+	${_auditd} \
+	${_auditon} \
 	${_asf} \
 	${_atm} \
 	${_authpf} \
@@ -195,6 +195,12 @@
 _atm=		atm
 .endif
 
+.if !defined(NO_AUDIT)
+_audit=		audit
+_auditd=	auditd
+_auditon=	auditon
+.endif
+
 .if !defined(NO_BIND)
 .if !defined(NO_BIND_DNSSEC) && !defined(NOCRYPT)
 _dnssec-keygen=		dnssec-keygen
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message