PERFORCE change 92524 for review
Robert Watson
rwatson at FreeBSD.org
Tue Feb 28 05:56:29 PST 2006
http://perforce.freebsd.org/chv.cgi?CH=92524
Change 92524 by rwatson at rwatson_peppercorn on 2006/02/28 13:56:24
Expose results of audit system call test not just as a config.h
entry, but also to Makefiles so that components can be conditionally
built.
Affected files ...
.. //depot/projects/trustedbsd/openbsm/config/config.h.in#6 edit
.. //depot/projects/trustedbsd/openbsm/configure#11 edit
.. //depot/projects/trustedbsd/openbsm/configure.ac#14 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/config/config.h.in#6 (text+ko) ====
@@ -3,6 +3,9 @@
/* Define to 1 if you have the `alarm' function. */
#undef HAVE_ALARM
+/* Define if audit system calls present */
+#undef HAVE_AUDIT_SYSCALLS
+
/* Define to 1 if you have the `bzero' function. */
#undef HAVE_BZERO
==== //depot/projects/trustedbsd/openbsm/configure#11 (xtext) ====
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#12 .
+# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#13 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5.
#
@@ -466,7 +466,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fast
depCXX_TRUE am__fastdepCXX_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fast
depCXX_TRUE am__fastdepCXX_FALSE LIBOBJS HAVE_AUDIT_SYSCALLS_TRUE HAVE_AUDIT_SYSCALLS_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -22867,15 +22867,29 @@
#define HAVE_AUDIT_SYSCALLS
_ACEOF
+have_audit_syscalls=true
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
+have_audit_syscalls=false
+
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
+
+if $have_audit_syscalls; then
+ HAVE_AUDIT_SYSCALLS_TRUE=
+ HAVE_AUDIT_SYSCALLS_FALSE='#'
+else
+ HAVE_AUDIT_SYSCALLS_TRUE='#'
+ HAVE_AUDIT_SYSCALLS_FALSE=
+fi
+
+
ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile man/Makefile tools/Makefile"
@@ -22998,6 +23012,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${HAVE_AUDIT_SYSCALLS_TRUE}" && test -z "${HAVE_AUDIT_SYSCALLS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_AUDIT_SYSCALLS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_AUDIT_SYSCALLS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -23608,6 +23629,8 @@
s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
+s, at HAVE_AUDIT_SYSCALLS_TRUE@,$HAVE_AUDIT_SYSCALLS_TRUE,;t t
+s, at HAVE_AUDIT_SYSCALLS_FALSE@,$HAVE_AUDIT_SYSCALLS_FALSE,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
==== //depot/projects/trustedbsd/openbsm/configure.ac#14 (text+ko) ====
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit at TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#13 $])
+AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#14 $])
AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_HEADER([config/config.h])
@@ -86,7 +86,11 @@
err = auditon(0, NULL, 0);
], [
AC_DEFINE(HAVE_AUDIT_SYSCALLS,, Define if audit system calls present)
+have_audit_syscalls=true
+], [
+have_audit_syscalls=false
])
+AM_CONDITIONAL(HAVE_AUDIT_SYSCALLS, $have_audit_syscalls)
AC_CONFIG_FILES([Makefile
bin/Makefile
More information about the trustedbsd-cvs
mailing list