NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

meson: add acl 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-03-02 15:14:14 +01:00
parent 066de4a8d3
commit 296bb0bb95
3 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -150,7 +150,6 @@ LIBVIRT_ARG_VIRTUALPORT
LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_WIRESHARK
LIBVIRT_ARG_YAJL LIBVIRT_ARG_YAJL
LIBVIRT_CHECK_ACL
LIBVIRT_CHECK_APPARMOR LIBVIRT_CHECK_APPARMOR
LIBVIRT_CHECK_ATTR LIBVIRT_CHECK_ATTR
LIBVIRT_CHECK_AUDIT LIBVIRT_CHECK_AUDIT
@ -478,7 +477,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_ACL
LIBVIRT_RESULT_APPARMOR LIBVIRT_RESULT_APPARMOR
LIBVIRT_RESULT_ATTR LIBVIRT_RESULT_ATTR
LIBVIRT_RESULT_AUDIT LIBVIRT_RESULT_AUDIT

37
m4/virt-acl.m4
View File

@ -1,37 +0,0 @@
dnl ACL support
dnl
dnl Copyright (C) 2017 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_CHECK_ACL], [
AC_CHECK_HEADERS([sys/acl.h])
ACL_CFLAGS=""
ACL_LIBS=""
with_acl=no
if test "x$ac_cv_header_sys_acl_h:x$with_linux" = "xyes:xyes"; then
ACL_LIBS="-lacl"
with_acl=yes
fi
AC_SUBST([ACL_CFLAGS])
AC_SUBST([ACL_LIBS])
])
AC_DEFUN([LIBVIRT_RESULT_ACL], [
LIBVIRT_RESULT_LIB([ACL])
])

15
meson.build
View File

@ -955,6 +955,16 @@ foreach name : optional_programs
endforeach endforeach
# generic build dependencies
if host_machine.system() == 'linux' and cc.has_header('sys/acl.h')
acl_dep = cc.find_library('acl', required: false)
conf.set('HAVE_SYS_ACL_H', 1)
else
acl_dep = dependency('', required: false)
endif
# define top include directory # define top include directory
top_inc_dir = include_directories('.') top_inc_dir = include_directories('.')
@ -973,6 +983,11 @@ configure_file(output: 'meson-config.h', configuration: conf)
# print configuration summary # print configuration summary
libs_summary = {
'acl': acl_dep.found(),
}
summary(libs_summary, section: 'Libraries', bool_yn: true)
test_summary = { test_summary = {
'Coverage': coverage_flags.length() > 0, 'Coverage': coverage_flags.length() > 0,
} }