From 8c1e9be48fe6a306c307d238849db2235f863f5b Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 8 Jan 2013 21:04:35 +0000 Subject: [PATCH] Rename HAVE_FUSE to WITH_FUSE --- 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 cd008995de..313b6dcc75 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 bda326ea53..25701fe78a 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 fdba042156..b6808da86b 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 93964a45c6..ccc9b9248e 100644 --- a/src/lxc/lxc_fuse.h +++ b/src/lxc/lxc_fuse.h @@ -27,7 +27,7 @@ # define FUSE_USE_VERSION 26 # include -# if HAVE_FUSE +# if WITH_FUSE # include # endif -- GitLab