[libvirt] [PATCH] Define ISCSIADM unconditionally

2014-03-21 Thread Ján Tomko
Commit 5e1d5dd moved the functions using isciadm to util/viriscsi.c,
but ISCSIADM was only defined when the iscsi backend was compiled in.

Define it unconditionally to fix the build (and allow testing
of viriscsi.c) even if iscsi backend is disabled.
---
Pushed as a build breaker fix.

 configure.ac | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 62b74c5..85d0dbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1852,9 +1852,13 @@ if test $with_storage_iscsi = yes || test 
$with_storage_iscsi = check; t
 
   if test $with_storage_iscsi = yes ; then
 AC_DEFINE_UNQUOTED([WITH_STORAGE_ISCSI], 1, [whether iSCSI backend for 
storage driver is enabled])
-AC_DEFINE_UNQUOTED([ISCSIADM],[$ISCSIADM],[Location of iscsiadm program])
   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])
 
 if test $with_storage_scsi = check; then
-- 
1.8.3.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list


Re: [libvirt] [PATCH] Define ISCSIADM unconditionally

2014-03-21 Thread Roman Bogorodskiy
  Ján Tomko wrote:

 Commit 5e1d5dd moved the functions using isciadm to util/viriscsi.c,
 but ISCSIADM was only defined when the iscsi backend was compiled in.
 
 Define it unconditionally to fix the build (and allow testing
 of viriscsi.c) even if iscsi backend is disabled.

Thanks, it works well for me.

Roman Bogorodskiy

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list