[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 10/29] Convert audit check to use LIBVIRT_CHECK_LIB



From: "Daniel P. Berrange" <berrange redhat com>

Signed-off-by: Daniel P. Berrange <berrange redhat com>
---
 configure.ac     | 51 ++-------------------------------------------------
 m4/virt-audit.m4 |  9 +++++++++
 2 files changed, 11 insertions(+), 49 deletions(-)
 create mode 100644 m4/virt-audit.m4

diff --git a/configure.ac b/configure.ac
index dbef499..fd214eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,7 @@ AC_MSG_RESULT([$VERSION_SCRIPT_FLAGS])
 
 LIBVIRT_COMPILE_WARNINGS
 
+LIBVIRT_CHECK_AUDIT
 LIBVIRT_CHECK_LIBATTR
 LIBVIRT_CHECK_SANLOCK
 LIBVIRT_CHECK_SASL
@@ -1174,50 +1175,6 @@ fi
 AC_SUBST([AVAHI_CFLAGS])
 AC_SUBST([AVAHI_LIBS])
 
-dnl Audit library
-AC_ARG_WITH([audit],
-  AC_HELP_STRING([--with-audit], [use audit library @<:@default=check@:>@]),
-  [],
-  [with_audit=check])
-
-AUDIT_CFLAGS=
-AUDIT_LIBS=
-if test "$with_audit" != "no" ; then
-  old_cflags="$CFLAGS"
-  old_libs="$LIBS"
-  if test "$with_audit" != "check" && test "$with_audit" != "yes" ; then
-    AUDIT_CFLAGS="-I$with_audit/include"
-    AUDIT_LIBS="-L$with_audit/lib"
-  fi
-  CFLAGS="$CFLAGS $AUDIT_CFLAGS"
-  LIBS="$LIBS $AUDIT_LIBS"
-  fail=0
-  AC_CHECK_HEADER([libaudit.h], [], [fail=1])
-  AC_CHECK_LIB([audit], [audit_encode_nv_string], [], [fail=1])
-
-  if test $fail = 1 ; then
-    if test "$with_audit" = "yes" ; then
-      AC_MSG_ERROR([You must install the Audit library in order to compile and run libvirt])
-    else
-      with_audit=no
-      AUDIT_CFLAGS=
-      AUDIT_LIBS=
-    fi
-  else
-    with_audit=yes
-  fi
-
-  if test "$with_audit" = "yes" ; then
-    AUDIT_LIBS="$AUDIT_LIBS -laudit"
-    AC_DEFINE_UNQUOTED([WITH_AUDIT], 1, [whether libaudit is available])
-  fi
-
-  CFLAGS="$old_cflags"
-  LIBS="$old_libs"
-fi
-AM_CONDITIONAL([WITH_AUDIT], [test "$with_audit" = "yes"])
-AC_SUBST([AUDIT_CFLAGS])
-AC_SUBST([AUDIT_LIBS])
 
 dnl UUCP style file locks for PTY consoles
 if test "$with_console_lock_files" != "no"; then
@@ -2901,6 +2858,7 @@ fi
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Libraries])
 AC_MSG_NOTICE([])
+LIBVIRT_RESULT_AUDIT
 LIBVIRT_RESULT_LIBATTR
 LIBVIRT_RESULT_SANLOCK
 LIBVIRT_RESULT_SASL
@@ -2938,11 +2896,6 @@ fi
 else
 AC_MSG_NOTICE([  polkit: no])
 fi
-if test "$with_audit" = "yes" ; then
-AC_MSG_NOTICE([   audit: $AUDIT_CFLAGS $AUDIT_LIBS])
-else
-AC_MSG_NOTICE([   audit: no])
-fi
 if test "$with_selinux" = "yes" ; then
 AC_MSG_NOTICE([ selinux: $SELINUX_CFLAGS $SELINUX_LIBS])
 else
diff --git a/m4/virt-audit.m4 b/m4/virt-audit.m4
new file mode 100644
index 0000000..47bd0cc
--- /dev/null
+++ b/m4/virt-audit.m4
@@ -0,0 +1,9 @@
+dnl The libaudit.so library
+
+AC_DEFUN([LIBVIRT_CHECK_AUDIT],[
+  LIBVIRT_CHECK_LIB([AUDIT], [audit], [audit], [audit_encode_nv_string], [libaudit.h])
+])
+
+AC_DEFUN([LIBVIRT_RESULT_AUDIT],[
+  LIBVIRT_RESULT_LIB([AUDIT], [audit])
+])
-- 
1.7.11.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]