]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
maint: Correctly detect wether "gluster" cli tool is accessible
authorPeter Krempa <pkrempa@redhat.com>
Mon, 7 Apr 2014 07:24:41 +0000 (09:24 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Mon, 7 Apr 2014 11:20:28 +0000 (13:20 +0200)
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

index e68f5f63ae7d85a8f2f04e7ec814c77fd2d33b0b..52c50df6a7141fe87b31ede4bcc3933fd7f2ccca 100644 (file)
@@ -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=