From 56746d8ad69fa52bf7b793d6e5697426d353b4be Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 7 Apr 2014 09:24:41 +0200 Subject: [PATCH] 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. --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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=