From: Kefu Chai Date: Thu, 28 Jan 2016 09:23:23 +0000 (+0800) Subject: make: disable FuseStore if !WITH_FUSE X-Git-Tag: v10.0.4~143^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=563206cc43ca140558289562a534b6b3c8b36a95;p=ceph.git make: disable FuseStore if !WITH_FUSE * configure.ac: "#define HAVE_LIBFUSE" if libfuse is found * os/Makefile.am: do not compile FuseStore.cc if libfuse is not found Signed-off-by: Kefu Chai --- diff --git a/configure.ac b/configure.ac index 73b62f8d8c02..e8a6f02d0575 100644 --- a/configure.ac +++ b/configure.ac @@ -523,7 +523,8 @@ AC_ARG_WITH([fuse], LIBFUSE= AS_IF([test "x$with_fuse" != xno], [ PKG_CHECK_MODULES([LIBFUSE], [fuse], - [HAVE_LIBFUSE=1], + [HAVE_LIBFUSE=1 + AC_DEFINE([HAVE_LIBFUSE], [1], [Define if you have fuse])], [AC_MSG_FAILURE([no FUSE found (use --without-fuse to disable)])]) ]) AM_CONDITIONAL(WITH_FUSE, [test "$HAVE_LIBFUSE" = "1"]) diff --git a/src/os/Makefile.am b/src/os/Makefile.am index 9c61d71ed432..6048fe8c1d1f 100644 --- a/src/os/Makefile.am +++ b/src/os/Makefile.am @@ -27,9 +27,12 @@ libos_a_SOURCES = \ os/kstore/kv.cc \ os/kstore/KStore.cc \ os/memstore/MemStore.cc \ - os/FuseStore.cc \ os/ObjectStore.cc +if WITH_FUSE +libos_a_SOURCES += os/FuseStore.cc +endif + if WITH_LIBAIO libos_a_SOURCES += \ os/bluestore/kv.cc \