meson: add iscsiadm as optional program

We compile src/util/viriscsi unconditionally where we require ISCSIADM
to be defined.

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/m4/virt-storage-iscsi.m4 b/m4/virt-storage-iscsi.m4
index eb0b08671c37774501dcad21e3a6cf8252f1af00..0e04079a1cc626c00ab047cba3fcad623f509e13 100644 (file)
--- a/m4/virt-storage-iscsi.m4
+++ b/m4/virt-storage-iscsi.m4
@@ -24,7 +24,6 @@ AC_DEFUN([LIBVIRT_STORAGE_ARG_ISCSI], [
 
 AC_DEFUN([LIBVIRT_STORAGE_CHECK_ISCSI], [
   if test "$with_storage_iscsi" = "yes" || test "$with_storage_iscsi" = "check"; then
-    AC_PATH_PROG([ISCSIADM], [iscsiadm], [], [$LIBVIRT_SBIN_PATH])
     if test "$with_storage_iscsi" = "yes" ; then
       if test -z "$ISCSIADM" ; then AC_MSG_ERROR([We need iscsiadm for iSCSI storage driver]) ; fi
     else
@@ -37,11 +36,6 @@ AC_DEFUN([LIBVIRT_STORAGE_CHECK_ISCSI], [
       AC_DEFINE_UNQUOTED([WITH_STORAGE_ISCSI], 1, [whether iSCSI backend for storage driver is enabled])
     fi
   fi
-  if test -z "$ISCIADM" ; then
-    AC_DEFINE_UNQUOTED([ISCSIADM],["iscsiadm"],[Name of iscsiadm program])
-  else
-    AC_DEFINE_UNQUOTED([ISCSIADM],["$ISCSIADM"],[Location of iscsiadm program])
-  fi
   AM_CONDITIONAL([WITH_STORAGE_ISCSI], [test "$with_storage_iscsi" = "yes"])
 ])
 

diff --git a/meson.build b/meson.build
index 0885a84f671215b89c7828c143f9d5775c9ebed8..50c35a885dbd4fccff749f1571f30eaecb14e09e 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -928,6 +928,7 @@ optional_programs = [
   'ip',
   'ip6tables',
   'iptables',
+  'iscsiadm',
   'mdevctl',
   'mm-ctl',
   'modprobe',