We compile src/util/viriscsi unconditionally where we require ISCSIADM
to be defined.
Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
m4/virt-storage-iscsi.m4 | 6 ------
meson.build | 1 +
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/m4/virt-storage-iscsi.m4 b/m4/virt-storage-iscsi.m4
index eb0b08671c3..0e04079a1cc 100644
--- 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 3f86f931de0..d4b3a9e910d 100644
--- a/meson.build
+++ b/meson.build
@@ -915,6 +915,7 @@ optional_programs = [
'ip',
'ip6tables',
'iptables',
+ 'iscsiadm',
'mdevctl',
'mm-ctl',
'modprobe',
--
2.26.2
