From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
---
configure.ac | 4 ++--
src/lxc/lxc_container.c | 2 +-
src/lxc/lxc_fuse.c | 2 +-
src/lxc/lxc_fuse.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index cd00899..313b6dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1440,7 +1440,7 @@ AS_IF([test "x$with_fuse" != "xno"],
[with_fuse=yes
AC_SUBST([FUSE_CFLAGS])
AC_SUBST([FUSE_LIBS])
- AC_DEFINE_UNQUOTED([HAVE_FUSE], 1, [whether fuse is available for libvirt lxc])
+ AC_DEFINE_UNQUOTED([WITH_FUSE], 1, [whether fuse is available for libvirt lxc])
],
[if test "x$with_fuse" = "xyes" ; then
AC_MSG_ERROR([You must install fuse library to compile libvirt])
@@ -1449,7 +1449,7 @@ AS_IF([test "x$with_fuse" != "xno"],
fi
])
])
-AM_CONDITIONAL([HAVE_FUSE], [test "x$with_fuse" = "xyes"])
+AM_CONDITIONAL([WITH_FUSE], [test "x$with_fuse" = "xyes"])
dnl virsh libraries
AC_CHECK_HEADERS([readline/readline.h])
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index bda326e..25701fe 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -596,7 +596,7 @@ cleanup:
return rc;
}
-#if HAVE_FUSE
+#if WITH_FUSE
static int lxcContainerMountProcFuse(virDomainDefPtr def,
const char *srcprefix)
{
diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index fdba042..b6808da 100644
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -38,7 +38,7 @@
#define VIR_FROM_THIS VIR_FROM_LXC
-#if HAVE_FUSE
+#if WITH_FUSE
static const char *fuse_meminfo_path = "/meminfo";
diff --git a/src/lxc/lxc_fuse.h b/src/lxc/lxc_fuse.h
index 93964a4..ccc9b92 100644
--- a/src/lxc/lxc_fuse.h
+++ b/src/lxc/lxc_fuse.h
@@ -27,7 +27,7 @@
# define FUSE_USE_VERSION 26
# include <config.h>
-# if HAVE_FUSE
+# if WITH_FUSE
# include <fuse.h>
# endif
--
1.7.11.7
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list