From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 7 Apr 2014 07:24:41 +0000 (+0200)
Subject: maint: Correctly detect wether "gluster" cli tool is accessible
X-Git-Tag: v1.2.4-rc1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56746d8ad69fa52bf7b793d6e5697426d353b4be;p=thirdparty%2Flibvirt.git

maint: Correctly detect wether "gluster" cli tool is accessible

The configure definition previously always defined the GLUSTER_CLI macro
and thus the code needing it wasn't compiled out if the tool wasn't
accessible.
---

diff --git a/configure.ac b/configure.ac
index e68f5f63ae..52c50df6a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1939,8 +1939,10 @@ AM_CONDITIONAL([WITH_STORAGE_GLUSTER], [test "$with_storage_gluster" = "yes"])
 if test "$with_storage_fs" = "yes" ||
    test "$with_storage_gluster" = "yes"; then
   AC_PATH_PROG([GLUSTER_CLI], [gluster], [], [$PATH:/sbin:/usr/sbin])
-  AC_DEFINE_UNQUOTED([GLUSTER_CLI], ["$GLUSTER_CLI"],
-    [Location or name of the gluster command line tool])
+  if test "x$GLUSTER_CLI" != "x"; then
+      AC_DEFINE_UNQUOTED([GLUSTER_CLI], ["$GLUSTER_CLI"],
+        [Location or name of the gluster command line tool])
+  fi
 fi
 
 LIBPARTED_CFLAGS=