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

meson: add pciaccess build option 

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-04-30 11:35:51 +02:00
parent 6d162feb17
commit 3c0cfd6578
4 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -109,7 +109,6 @@ fi
# Check for compiler and library settings. # Check for compiler and library settings.
LIBVIRT_ARG_NSS LIBVIRT_ARG_NSS
LIBVIRT_ARG_PCIACCESS
LIBVIRT_ARG_PM_UTILS LIBVIRT_ARG_PM_UTILS
LIBVIRT_ARG_POLKIT LIBVIRT_ARG_POLKIT
LIBVIRT_ARG_SANLOCK LIBVIRT_ARG_SANLOCK
@ -121,7 +120,6 @@ LIBVIRT_ARG_WIRESHARK
LIBVIRT_ARG_YAJL LIBVIRT_ARG_YAJL
LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_NWFILTER
LIBVIRT_CHECK_PCIACCESS
LIBVIRT_CHECK_PM_UTILS LIBVIRT_CHECK_PM_UTILS
LIBVIRT_CHECK_POLKIT LIBVIRT_CHECK_POLKIT
LIBVIRT_CHECK_PTHREAD LIBVIRT_CHECK_PTHREAD
@ -411,7 +409,6 @@ AC_MSG_NOTICE([Libraries])
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXL
LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NSS
LIBVIRT_RESULT_PCIACCESS
LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_PM_UTILS
LIBVIRT_RESULT_POLKIT LIBVIRT_RESULT_POLKIT
LIBVIRT_RESULT_RBD LIBVIRT_RESULT_RBD

30
m4/virt-pciaccess.m4
View File

@ -1,30 +0,0 @@
dnl The libpciaccess.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_PCIACCESS],[
LIBVIRT_ARG_WITH_FEATURE([PCIACCESS], [pciaccess], [check], [0.10.0])
])
AC_DEFUN([LIBVIRT_CHECK_PCIACCESS],[
LIBVIRT_CHECK_PKG([PCIACCESS], [pciaccess], [0.10.0])
])
AC_DEFUN([LIBVIRT_RESULT_PCIACCESS],[
LIBVIRT_RESULT_LIB([PCIACCESS])
])

4
meson.build
View File

@ -1241,6 +1241,9 @@ openwsman_dep = dependency('openwsman', version: '>=' + openwsman_version, requi
parallels_sdk_version = '7.0.22' parallels_sdk_version = '7.0.22'
parallels_sdk_dep = dependency('parallels-sdk', version: '>=' + parallels_sdk_version, required: false) parallels_sdk_dep = dependency('parallels-sdk', version: '>=' + parallels_sdk_version, required: false)
pciaccess_version = '0.10.0'
pciaccess_dep = dependency('pciaccess', version: '>=' + pciaccess_version, required: get_option('pciaccess'))
# 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)
@ -1396,6 +1399,7 @@ libs_summary = {
'NLS': have_gnu_gettext_tools, 'NLS': have_gnu_gettext_tools,
'numaclt': numactl_dep.found(), 'numaclt': numactl_dep.found(),
'openwsman': openwsman_dep.found(), 'openwsman': openwsman_dep.found(),
'pciaccess': pciaccess_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

@ -33,6 +33,7 @@ option('netcf', type: 'feature', value: 'auto', description: 'netcf support')
option('nls', type: 'feature', value: 'auto', description: 'nls support') option('nls', type: 'feature', value: 'auto', description: 'nls support')
option('numactl', type: 'feature', value: 'auto', description: 'numactl support') option('numactl', type: 'feature', value: 'auto', description: 'numactl support')
option('openwsman', type: 'feature', value: 'auto', description: 'openwsman support') option('openwsman', type: 'feature', value: 'auto', description: 'openwsman support')
option('pciaccess', type: 'feature', value: 'auto', description: 'pciaccess support')
option('readline', type: 'feature', value: 'auto', description: 'readline support') option('readline', type: 'feature', value: 'auto', description: 'readline support')