]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
make: disable FuseStore if !WITH_FUSE
authorKefu Chai <kchai@redhat.com>
Thu, 28 Jan 2016 09:23:23 +0000 (17:23 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 28 Jan 2016 15:36:45 +0000 (23:36 +0800)
* 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 <kchai@redhat.com>
configure.ac
src/os/Makefile.am

index 73b62f8d8c02c3c14905bab94e52ae2ed830702d..e8a6f02d0575cb77225bc79aa0be9ab2012b00c8 100644 (file)
@@ -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"])
index 9c61d71ed43263fb2b15e750e109429f86bdea9b..6048fe8c1d1f28807bd8375a387f1ba7431fce95 100644 (file)
@@ -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 \