autotools: use PKG_CHECK_MODULES for libaudit

Replace UL_CHECK_LIB(audit) with PKG_CHECK_MODULES to use the
pkg-config module shipped by libaudit. This creates $(AUDIT_LIBS)
variable, replacing hardcoded -laudit in Makemodule.am files.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/configure.ac b/configure.ac
index d41fe419bc394df983ce47dd875b071a51fe6f16..6c9a71e25b04f2aa4ec9671bdadca01cf7e2c88c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1089,15 +1089,21 @@ AC_ARG_WITH([audit],
   [], [with_audit=no]
 )
 
+have_audit=no
 AS_IF([test "x$with_audit" = xno], [
   AM_CONDITIONAL([HAVE_AUDIT], [false])
 ], [
-  UL_CHECK_LIB([audit], [audit_log_user_message])
+  PKG_CHECK_MODULES([AUDIT], [audit], [have_audit=yes], [have_audit=no])
   AS_CASE([$with_audit:$have_audit],
     [yes:no],
-      [AC_MSG_ERROR([Audit selected but libaudit not found (or does not support audit_log_user_message())])]
+      [AC_MSG_ERROR([Audit selected but libaudit not found])]
   )
+  AS_IF([test "x$have_audit" = xyes], [
+    AC_DEFINE([HAVE_LIBAUDIT], [1], [Define if audit is available])
+    AM_CONDITIONAL([HAVE_AUDIT], [true])
+  ])
 ])
+AC_SUBST([AUDIT_LIBS])
 
 AC_ARG_WITH([udev], AS_HELP_STRING([--without-udev], [compile without udev support]),
   [], [with_udev=auto]

diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
index 9a8a14d5d100bb50cdee9e2a8fcaf64a6bfe2262..a0d9bf829ef19a1e84953395714aaeb3d247a260 100644 (file)
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@ -65,7 +65,7 @@ if HAVE_LINUXPAM
 login_LDADD += -lpam_misc
 endif
 if HAVE_AUDIT
-login_LDADD += -laudit
+login_LDADD += $(AUDIT_LIBS)
 endif
 if HAVE_SELINUX
 login_LDADD += $(SELINUX_LIBS)

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 15be9544717af1b5da70f354761f3c0a77638067..c90ed7e7ee2b40d9ff9129036c9d6313274400cb 100644 (file)
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -583,7 +583,7 @@ hwclock_SOURCES += \
        lib/monotonic.c
 endif
 if HAVE_AUDIT
-hwclock_LDADD += -laudit
+hwclock_LDADD += $(AUDIT_LIBS)
 endif
 endif # BUILD_HWCLOCK