[libvirt PATCH 104/351] meson: add storage iscsi-direct build option

[Pavel Hrdina]

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 configure.ac                    |  4 ---
 m4/virt-storage-iscsi-direct.m4 | 44 ---------------------------------
 meson.build                     |  8 ++++++
 meson_options.txt               |  1 +
 4 files changed, 9 insertions(+), 48 deletions(-)
 delete mode 100644 m4/virt-storage-iscsi-direct.m4

diff --git a/configure.ac b/configure.ac
index ba2b247b926..688425956e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,7 +137,6 @@ dnl Storage driver checks
 dnl
 
 LIBVIRT_STORAGE_ARG_LVM
-LIBVIRT_STORAGE_ARG_ISCSI_DIRECT
 LIBVIRT_STORAGE_ARG_SCSI
 LIBVIRT_STORAGE_ARG_MPATH
 LIBVIRT_STORAGE_ARG_RBD
@@ -147,7 +146,6 @@ LIBVIRT_STORAGE_ARG_VSTORAGE
 
 if test "$with_libvirtd" = "no"; then
   with_storage_lvm=no
-  with_storage_iscsi_direct=no
   with_storage_scsi=no
   with_storage_mpath=no
   with_storage_rbd=no
@@ -157,7 +155,6 @@ if test "$with_libvirtd" = "no"; then
 fi
 
 LIBVIRT_STORAGE_CHECK_LVM
-LIBVIRT_STORAGE_CHECK_ISCSI_DIRECT
 LIBVIRT_STORAGE_CHECK_SCSI
 LIBVIRT_STORAGE_CHECK_MPATH
 LIBVIRT_STORAGE_CHECK_RBD
@@ -222,7 +219,6 @@ AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Storage Drivers])
 AC_MSG_NOTICE([])
 LIBVIRT_STORAGE_RESULT_LVM
-LIBVIRT_STORAGE_RESULT_ISCSI_DIRECT
 LIBVIRT_STORAGE_RESULT_SCSI
 LIBVIRT_STORAGE_RESULT_MPATH
 LIBVIRT_STORAGE_RESULT_RBD
diff --git a/m4/virt-storage-iscsi-direct.m4 b/m4/virt-storage-iscsi-direct.m4
deleted file mode 100644
index dab44141691..00000000000
--- a/m4/virt-storage-iscsi-direct.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-dnl Iscsi-direct storage
-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_STORAGE_ARG_ISCSI_DIRECT], [
-  LIBVIRT_ARG_WITH_FEATURE([STORAGE_ISCSI_DIRECT],
-                           [iscsi-direct backend for the storage driver],
-                           [check])
-])
-
-AC_DEFUN([LIBVIRT_STORAGE_CHECK_ISCSI_DIRECT], [
-  AC_REQUIRE([LIBVIRT_CHECK_LIBISCSI])
-  if test "$with_storage_iscsi_direct" = "check"; then
-    with_storage_iscsi_direct=$with_libiscsi
-  fi
-  if test "$with_storage_iscsi_direct" = "yes"; then
-    if test "$with_libiscsi" = "no"; then
-      AC_MSG_ERROR([Need libiscsi for iscsi-direct storage driver])
-    fi
-    AC_DEFINE_UNQUOTED([WITH_STORAGE_ISCSI_DIRECT], [1],
-                       [whether iSCSI backend for storage driver is enabled])
-  fi
-  AM_CONDITIONAL([WITH_STORAGE_ISCSI_DIRECT],
-                 [test "$with_storage_iscsi_direct" = "yes"])
-])
-
-AC_DEFUN([LIBVIRT_STORAGE_RESULT_ISCSI_DIRECT], [
-  LIBVIRT_RESULT([iscsi-direct], [$with_storage_iscsi_direct])
-])
diff --git a/meson.build b/meson.build
index 2066c537d73..4576f18a6e2 100644
--- a/meson.build
+++ b/meson.build
@@ -1934,6 +1934,13 @@ if conf.has('WITH_LIBVIRTD')
   elif get_option('storage_iscsi').enabled()
     error('We need iscsiadm for iSCSI storage driver')
   endif
+
+  if not get_option('storage_iscsi_direct').disabled() and libiscsi_dep.found()
+    use_storage = true
+    conf.set('WITH_STORAGE_ISCSI_DIRECT', 1)
+  elif get_option('storage_iscsi_direct').enabled()
+    error('Need libiscsi for iscsi-direct storage driver')
+  endif
 endif
 
 if use_storage
@@ -1983,6 +1990,7 @@ storagedriver_summary = {
   'FS': conf.has('WITH_STORAGE_FS'),
   'NetFS': conf.has('WITH_STORAGE_FS'),
   'iSCSI': conf.has('WITH_STORAGE_ISCSI'),
+  'iscsi-direct': conf.has('WITH_STORAGE_ISCSI_DIRECT'),
   'Disk': conf.has('WITH_STORAGE_DISK'),
   'Gluster': conf.has('WITH_STORAGE_GLUSTER'),
 }
diff --git a/meson_options.txt b/meson_options.txt
index cff49277ea1..975479e7b8c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -79,3 +79,4 @@ option('storage_disk', type: 'feature', value: 'auto', description: 'GPartd Disk
 option('storage_fs', type: 'feature', value: 'auto', description: 'FileSystem backend for the storage driver')
 option('storage_gluster', type: 'feature', value: 'auto', description: 'Gluster backend for the storage driver')
 option('storage_iscsi', type: 'feature', value: 'auto', description: 'iscsi backend for the storage driver')
+option('storage_iscsi_direct', type: 'feature', value: 'auto', description: 'iscsi-direct backend for the storage driver')
-- 
2.26.2