External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: add libiscsi 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-06-24 13:26:48 +02:00
parent 3bf9d6a224
commit 86a7ffb0a2
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

@ -110,7 +110,6 @@ fi
# Check for compiler and library settings. # Check for compiler and library settings.
LIBVIRT_ARG_LIBISCSI
LIBVIRT_ARG_LIBPCAP LIBVIRT_ARG_LIBPCAP
LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBSSH
LIBVIRT_ARG_LIBXML LIBVIRT_ARG_LIBXML
@ -132,7 +131,6 @@ LIBVIRT_ARG_VIRTUALPORT
LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_WIRESHARK
LIBVIRT_ARG_YAJL LIBVIRT_ARG_YAJL
LIBVIRT_CHECK_LIBISCSI
LIBVIRT_CHECK_LIBNL LIBVIRT_CHECK_LIBNL
LIBVIRT_CHECK_LIBPARTED LIBVIRT_CHECK_LIBPARTED
LIBVIRT_CHECK_LIBPCAP LIBVIRT_CHECK_LIBPCAP
@ -434,7 +432,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_LIBISCSI
LIBVIRT_RESULT_LIBNL LIBVIRT_RESULT_LIBNL
LIBVIRT_RESULT_LIBPCAP LIBVIRT_RESULT_LIBPCAP
LIBVIRT_RESULT_LIBSSH LIBVIRT_RESULT_LIBSSH

30
m4/virt-libiscsi.m4
View File

@ -1,30 +0,0 @@
dnl Libiscsi library
dnl
dnl Copyright (C) 2018 Clementine Hayat.
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_LIBISCSI],[
LIBVIRT_ARG_WITH_FEATURE([LIBISCSI], [libiscsi], [check], [1.18.0])
])
AC_DEFUN([LIBVIRT_CHECK_LIBISCSI],[
LIBVIRT_CHECK_PKG([LIBISCSI], [libiscsi], [1.18.0])
])
AC_DEFUN([LIBVIRT_RESULT_LIBISCSI],[
LIBVIRT_RESULT_LIB(LIBISCSI)
])

4
meson.build
View File

@ -1081,6 +1081,9 @@ if host_machine.system() == 'freebsd'
add_project_link_arguments('-lkvm', language: 'c') add_project_link_arguments('-lkvm', language: 'c')
endif endif
libiscsi_version = '1.18.0'
libiscsi_dep = dependency('libiscsi', version: '>=' + libiscsi_version, required: get_option('libiscsi'))
# 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)
@ -1221,6 +1224,7 @@ libs_summary = {
'glusterfs': glusterfs_dep.found(), 'glusterfs': glusterfs_dep.found(),
'gnutls': gnutls_dep.found(), 'gnutls': gnutls_dep.found(),
'hal': hal_dep.found(), 'hal': hal_dep.found(),
'libiscsi': libiscsi_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

@ -24,6 +24,7 @@ option('firewalld_zone', type: 'feature', value: 'auto', description: 'whether t
option('fuse', type: 'feature', value: 'auto', description: 'fuse support') option('fuse', type: 'feature', value: 'auto', description: 'fuse support')
option('glusterfs', type: 'feature', value: 'auto', description: 'glusterfs support') option('glusterfs', type: 'feature', value: 'auto', description: 'glusterfs support')
option('hal', type: 'feature', value: 'auto', description: 'hal support') option('hal', type: 'feature', value: 'auto', description: 'hal support')
option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi support')
option('readline', type: 'feature', value: 'auto', description: 'readline support') option('readline', type: 'feature', value: 'auto', description: 'readline support')