diff --git a/configure.ac b/configure.ac index cd008995de77f75f952b42036271a1b24e0bbf94..313b6dcc75b7effbccb62d8bc943478a63c6a602 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 bda326ea5371361830720a77f35938c4efccebb4..25701fe78a96ce23d50421a2141f223ab835eb8b 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 fdba04215617e68aebdade7e4850bc2a852fed54..b6808da86b2f416a4185280e53e57753021913e2 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 93964a45c60f2e8c566c1ce1617ecffb8f7f2217..ccc9b9248e5777d574a07a7fee04a15ade8d7824 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