Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- configure.ac | 3 --- m4/virt-capng.m4 | 30 ------------------------------ meson.build | 6 ++++++ meson_options.txt | 1 + 4 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-capng.m4 diff --git a/configure.ac b/configure.ac index 25fb8ca8f5f..acd326adf71 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi # Check for compiler and library settings. -LIBVIRT_ARG_CAPNG LIBVIRT_ARG_CURL LIBVIRT_ARG_DBUS LIBVIRT_ARG_FIREWALLD @@ -144,7 +143,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_CAPNG LIBVIRT_CHECK_CURL LIBVIRT_CHECK_DBUS LIBVIRT_CHECK_DEVMAPPER @@ -467,7 +465,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_CAPNG LIBVIRT_RESULT_CURL LIBVIRT_RESULT_DBUS LIBVIRT_RESULT_DLOPEN diff --git a/m4/virt-capng.m4 b/m4/virt-capng.m4 deleted file mode 100644 index bf9fcd2aa84..00000000000 --- a/m4/virt-capng.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libcapng.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_CAPNG],[ - LIBVIRT_ARG_WITH_FEATURE([CAPNG], [cap-ng], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_CAPNG],[ - LIBVIRT_CHECK_LIB([CAPNG], [cap-ng], [capng_updatev], [cap-ng.h]) -]) - -AC_DEFUN([LIBVIRT_RESULT_CAPNG],[ - LIBVIRT_RESULT_LIB([CAPNG]) -]) diff --git a/meson.build b/meson.build index 7988a7b0a13..d504e7720d2 100644 --- a/meson.build +++ b/meson.build @@ -974,6 +974,11 @@ if blkid_dep.found() conf.set('WITH_BLKID', 1) endif +capng_dep = cc.find_library('cap-ng', required: get_option('capng')) +if capng_dep.found() + conf.set('WITH_CAPNG', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) @@ -1089,6 +1094,7 @@ libs_summary = { 'audit': audit_dep.found(), 'bash_completion': bash_completion_dep.found(), 'blkid': blkid_dep.found(), + 'capng': capng_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 73e64f26b0a..f53c94c6982 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -15,4 +15,5 @@ option('audit', type: 'feature', value: 'auto', description: 'audit support') option('bash_completion', type: 'feature', value: 'auto', description: 'bash-completion support') option('bash_completion_dir', type: 'string', value: '', description: 'directory containing bash completion scripts') option('blkid', type: 'feature', value: 'auto', description: 'blkid support') +option('capng', type: 'feature', value: 'auto', description: 'cap-ng support') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2
