[libvirt PATCH 035/351] meson: add attr build option
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
configure.ac | 3 ---
m4/virt-attr.m4 | 13 -------------
meson.build | 3 +++
meson_options.txt | 1 +
4 files changed, 4 insertions(+), 16 deletions(-)
delete mode 100644 m4/virt-attr.m4
diff --git a/configure.ac b/configure.ac
index 5bf4727faa7..6d5fcb4281d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,7 +114,6 @@ fi
# Check for compiler and library settings.
-LIBVIRT_ARG_ATTR
LIBVIRT_ARG_AUDIT
LIBVIRT_ARG_BASH_COMPLETION
LIBVIRT_ARG_BLKID
@@ -149,7 +148,6 @@ LIBVIRT_ARG_VIRTUALPORT
LIBVIRT_ARG_WIRESHARK
LIBVIRT_ARG_YAJL
-LIBVIRT_CHECK_ATTR
LIBVIRT_CHECK_AUDIT
LIBVIRT_CHECK_BASH_COMPLETION
LIBVIRT_CHECK_BLKID
@@ -477,7 +475,6 @@ LIBVIRT_RESULT_DRIVER_MODULES
AC_MSG_NOTICE([])
AC_MSG_NOTICE([Libraries])
AC_MSG_NOTICE([])
-LIBVIRT_RESULT_ATTR
LIBVIRT_RESULT_AUDIT
LIBVIRT_RESULT_BASH_COMPLETION
LIBVIRT_RESULT_BLKID
diff --git a/m4/virt-attr.m4 b/m4/virt-attr.m4
deleted file mode 100644
index 478549c17f1..00000000000
--- a/m4/virt-attr.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-dnl The libattr.so library
-
-AC_DEFUN([LIBVIRT_ARG_ATTR],[
- LIBVIRT_ARG_WITH_FEATURE([ATTR], [attr], [check])
-])
-
-AC_DEFUN([LIBVIRT_CHECK_ATTR],[
- LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [sys/xattr.h])
-])
-
-AC_DEFUN([LIBVIRT_RESULT_ATTR],[
- LIBVIRT_RESULT_LIB([ATTR])
-])
diff --git a/meson.build b/meson.build
index be0bc975116..3d7bd8c4149 100644
--- a/meson.build
+++ b/meson.build
@@ -958,6 +958,8 @@ if apparmor_dep.found()
conf.set_quoted('APPARMOR_PROFILES_PATH',
'/sys/kernel/security/apparmor/profiles')
endif
+attr_dep = cc.find_library('attr', required: get_option('attr'))
+
# define top include directory
@@ -980,6 +982,7 @@ configure_file(output: 'meson-config.h', configuration: conf)
libs_summary = {
'acl': acl_dep.found(),
'apparmor': apparmor_dep.found(),
+ 'attr': attr_dep.found(),
}
summary(libs_summary, section: 'Libraries', bool_yn: true)
diff --git a/meson_options.txt b/meson_options.txt
index dc60d569dd2..be7ad8b96f9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,3 +10,4 @@ option('test_coverage', type: 'boolean', value: false,
description: 'turn on cod
# build dependencies options
option('apparmor', type: 'feature', value: 'auto', description:
'apparmor support')
+option('attr', type: 'feature', value: 'auto', description:
'attr support')
--
2.26.2