openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

meson: add blkid build dependency 

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-06-24 13:25:04 +02:00
parent f6c5da9c14
commit 0dcbbb29e9
4 changed files with 8 additions and 33 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_BLKID
LIBVIRT_ARG_CAPNG LIBVIRT_ARG_CAPNG
LIBVIRT_ARG_CURL LIBVIRT_ARG_CURL
LIBVIRT_ARG_DBUS LIBVIRT_ARG_DBUS
@ -145,7 +144,6 @@ LIBVIRT_ARG_VIRTUALPORT
LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_WIRESHARK
LIBVIRT_ARG_YAJL LIBVIRT_ARG_YAJL
LIBVIRT_CHECK_BLKID
LIBVIRT_CHECK_CAPNG LIBVIRT_CHECK_CAPNG
LIBVIRT_CHECK_CURL LIBVIRT_CHECK_CURL
LIBVIRT_CHECK_DBUS LIBVIRT_CHECK_DBUS
@ -467,7 +465,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_BLKID
LIBVIRT_RESULT_CAPNG LIBVIRT_RESULT_CAPNG
LIBVIRT_RESULT_CURL LIBVIRT_RESULT_CURL
LIBVIRT_RESULT_DBUS LIBVIRT_RESULT_DBUS

30
m4/virt-blkid.m4
View File

@ -1,30 +0,0 @@
dnl The libblkid.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_BLKID],[
LIBVIRT_ARG_WITH_FEATURE([BLKID], [blkid], [check], [2.17])
])
AC_DEFUN([LIBVIRT_CHECK_BLKID],[
LIBVIRT_CHECK_PKG([BLKID], [blkid], [2.17])
])
AC_DEFUN([LIBVIRT_RESULT_BLKID],[
LIBVIRT_RESULT_LIB([BLKID])
])

7
meson.build
View File

@ -984,6 +984,12 @@ endif
bash_completion_version = '2.0' bash_completion_version = '2.0'
bash_completion_dep = dependency('bash-completion', version: '>=' + bash_completion_version, required: get_option('bash_completion')) bash_completion_dep = dependency('bash-completion', version: '>=' + bash_completion_version, required: get_option('bash_completion'))
blkid_version = '2.17'
blkid_dep = dependency('blkid', version: '>=' + blkid_version, required: get_option('blkid'))
if blkid_dep.found()
conf.set('WITH_BLKID', 1)
endif
# readline 7.0 is the first version which includes pkg-config support # readline 7.0 is the first version which includes pkg-config support
readline_version = '7.0' readline_version = '7.0'
readline_dep = dependency('readline', version: '>=' + readline_version, required: false) readline_dep = dependency('readline', version: '>=' + readline_version, required: false)
@ -1098,6 +1104,7 @@ libs_summary = {
'attr': attr_dep.found(), 'attr': attr_dep.found(),
'audit': audit_dep.found(), 'audit': audit_dep.found(),
'bash_completion': bash_completion_dep.found(), 'bash_completion': bash_completion_dep.found(),
'blkid': blkid_dep.found(),
'readline': readline_dep.found(), 'readline': readline_dep.found(),
} }
summary(libs_summary, section: 'Libraries', bool_yn: true) summary(libs_summary, section: 'Libraries', bool_yn: true)

1
meson_options.txt
View File

@ -15,6 +15,7 @@ option('attr', type: 'feature', value: 'auto', description: 'attr support')
option('audit', type: 'feature', value: 'auto', description: 'audit support') option('audit', type: 'feature', value: 'auto', description: 'audit support')
option('bash_completion', type: 'feature', value: 'auto', description: 'bash-completion 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('bash_completion_dir', type: 'string', value: '', description: 'directory containing bash completion scripts')
option('blkid', type: 'feature', value: 'auto', description: 'blkid support')
option('readline', type: 'feature', value: 'auto', description: 'readline support') option('readline', type: 'feature', value: 'auto', description: 'readline support')