meson: add libiscsi build dependency

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/configure.ac b/configure.ac
index 0abc79b68e9ffb8dbc6fc50d71a4b9287729d521..c4c6b20d9a6936437febb8921dd3aa5b9d898889 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,6 @@ fi
 
 # Check for compiler and library settings.
 
-LIBVIRT_ARG_LIBISCSI
 LIBVIRT_ARG_LIBPCAP
 LIBVIRT_ARG_LIBSSH
 LIBVIRT_ARG_LIBXML
@@ -132,7 +131,6 @@ LIBVIRT_ARG_VIRTUALPORT
 LIBVIRT_ARG_WIRESHARK
 LIBVIRT_ARG_YAJL
 
-LIBVIRT_CHECK_LIBISCSI
 LIBVIRT_CHECK_LIBNL
 LIBVIRT_CHECK_LIBPARTED
 LIBVIRT_CHECK_LIBPCAP
@@ -434,7 +432,6 @@ LIBVIRT_RESULT_DRIVER_MODULES
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Libraries])
 AC_MSG_NOTICE([])
-LIBVIRT_RESULT_LIBISCSI
 LIBVIRT_RESULT_LIBNL
 LIBVIRT_RESULT_LIBPCAP
 LIBVIRT_RESULT_LIBSSH

diff --git a/m4/virt-libiscsi.m4 b/m4/virt-libiscsi.m4
deleted file mode 100644 (file)
index 2747f00..0000000
--- a/m4/virt-libiscsi.m4
+++ /dev/null
@@ -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)
-])

diff --git a/meson.build b/meson.build
index e43a916d3cfa66438f760305cb400dbff441c594..63f83f3ec995cd37e708668174cc22e6707ef121 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1081,6 +1081,9 @@ if host_machine.system() == 'freebsd'
   add_project_link_arguments('-lkvm', language: 'c')
 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_version = '7.0'
 readline_dep = dependency('readline', version: '>=' + readline_version, required: false)
@@ -1221,6 +1224,7 @@ libs_summary = {
   'glusterfs': glusterfs_dep.found(),
   'gnutls': gnutls_dep.found(),
   'hal': hal_dep.found(),
+  'libiscsi': libiscsi_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 ff8f81645e49257b9198d7dfb602f457153e044e..26d2ae6b9dd09989cec98ee240be5a90e96a3830 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -24,6 +24,7 @@ option('firewalld_zone', type: 'feature', value: 'auto', description: 'whether t
 option('fuse', type: 'feature', value: 'auto', description: 'fuse support')
 option('glusterfs', type: 'feature', value: 'auto', description: 'glusterfs 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')