External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: add audit build dependency

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Pavel Hrdina 2020-07-29 14:20:29 +02:00
parent 3ace72965c
commit 1e952c20da
4 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -114,7 +114,6 @@ fi
# Check for compiler and library settings. # Check for compiler and library settings.
LIBVIRT_ARG_AUDIT
LIBVIRT_ARG_BASH_COMPLETION LIBVIRT_ARG_BASH_COMPLETION
LIBVIRT_ARG_BLKID LIBVIRT_ARG_BLKID
LIBVIRT_ARG_CAPNG LIBVIRT_ARG_CAPNG
@ -148,7 +147,6 @@ LIBVIRT_ARG_VIRTUALPORT
LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_WIRESHARK
LIBVIRT_ARG_YAJL LIBVIRT_ARG_YAJL
LIBVIRT_CHECK_AUDIT
LIBVIRT_CHECK_BASH_COMPLETION LIBVIRT_CHECK_BASH_COMPLETION
LIBVIRT_CHECK_BLKID LIBVIRT_CHECK_BLKID
LIBVIRT_CHECK_CAPNG LIBVIRT_CHECK_CAPNG
@ -473,7 +471,6 @@ LIBVIRT_RESULT_DRIVER_MODULES
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([Libraries])
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
LIBVIRT_RESULT_AUDIT
LIBVIRT_RESULT_BASH_COMPLETION LIBVIRT_RESULT_BASH_COMPLETION
LIBVIRT_RESULT_BLKID LIBVIRT_RESULT_BLKID
LIBVIRT_RESULT_CAPNG LIBVIRT_RESULT_CAPNG

31
m4/virt-audit.m4
View File

@ -1,31 +0,0 @@
dnl The libaudit.so library
dnl
dnl Copyright (C) 2012-2013 Red Hat, Inc.
dnl
dnl This library is free software; you can redistribute it and/or
dnl modify it under the terms of the GNU Lesser General Public
dnl License as published by the Free Software Foundation; either
dnl version 2.1 of the License, or (at your option) any later version.
dnl
dnl This library is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dnl Lesser General Public License for more details.
dnl
dnl You should have received a copy of the GNU Lesser General Public
dnl License along with this library. If not, see
dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_AUDIT],[
LIBVIRT_ARG_WITH_FEATURE([AUDIT], [audit], [check])
])
AC_DEFUN([LIBVIRT_CHECK_AUDIT],[
LIBVIRT_CHECK_LIB([AUDIT], [audit],
[audit_encode_nv_string], [libaudit.h])
])
AC_DEFUN([LIBVIRT_RESULT_AUDIT],[
LIBVIRT_RESULT_LIB([AUDIT])
])

6
meson.build
View File

@ -976,6 +976,11 @@ if attr_dep.found()
conf.set('HAVE_LIBATTR', 1) conf.set('HAVE_LIBATTR', 1)
endif endif
audit_dep = cc.find_library('audit', required: get_option('audit'))
if audit_dep.found()
conf.set('WITH_AUDIT', 1)
endif
# define top include directory # define top include directory
@ -999,6 +1004,7 @@ libs_summary = {
'acl': acl_dep.found(), 'acl': acl_dep.found(),
'apparmor': apparmor_dep.found(), 'apparmor': apparmor_dep.found(),
'attr': attr_dep.found(), 'attr': attr_dep.found(),
'audit': audit_dep.found(),
} }
summary(libs_summary, section: 'Libraries', bool_yn: true) summary(libs_summary, section: 'Libraries', bool_yn: true)

1
meson_options.txt
View File

@ -12,6 +12,7 @@ option('git_werror', type: 'feature', value: 'auto', description: 'use -Werror i
# build dependencies options # build dependencies options
option('apparmor', type: 'feature', value: 'auto', description: 'apparmor support') option('apparmor', type: 'feature', value: 'auto', description: 'apparmor support')
option('attr', type: 'feature', value: 'auto', description: 'attr support') option('attr', type: 'feature', value: 'auto', description: 'attr support')
option('audit', type: 'feature', value: 'auto', description: 'audit support')
# build driver options # build driver options