From: Pavel Hrdina Date: Wed, 24 Jun 2020 10:17:39 +0000 (+0200) Subject: meson: add iscsiadm as optional program X-Git-Tag: v6.7.0-rc1~572 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=636bb28c8b4755f0a674f7e3db15b3a35094a06f;p=thirdparty%2Flibvirt.git meson: add iscsiadm as optional program We compile src/util/viriscsi unconditionally where we require ISCSIADM to be defined. Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- diff --git a/m4/virt-storage-iscsi.m4 b/m4/virt-storage-iscsi.m4 index eb0b08671c..0e04079a1c 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 0885a84f67..50c35a885d 100644 --- a/meson.build +++ b/meson.build @@ -928,6 +928,7 @@ optional_programs = [ 'ip', 'ip6tables', 'iptables', + 'iscsiadm', 'mdevctl', 'mm-ctl', 'modprobe',