[libvirt] [PATCH] maint: Correctly detect wether "gluster" cli tool is accessible

Peter Krempa pkrempa at redhat.com
Mon Apr 7 07:49:36 UTC 2014


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.
---
 configure.ac | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index e68f5f6..fa07cfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1938,9 +1938,11 @@ 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])
+  AC_PATH_PROG([GLUSTER_CLI], [gluster], [no], [$PATH:/sbin:/usr/sbin])
+  if test "x$GLUSTER_CLI" != "xno"; then
+      AC_DEFINE_UNQUOTED([GLUSTER_CLI], ["$GLUSTER_CLI"],
+        [Location or name of the gluster command line tool])
+  fi
 fi

 LIBPARTED_CFLAGS=
-- 
1.9.1




More information about the libvir-list mailing list