From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 27 Jul 2016 12:19:04 +0000 (+0800)
Subject: Merge pull request #9371 from ukernel/wip-osx-fuse
X-Git-Tag: ses5-milestone5~283
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e8e68aa48b5eae91b8e4886536ef558ca94e44e;p=ceph.git

Merge pull request #9371 from ukernel/wip-osx-fuse

build ceph-fuse on OSX

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

4e8e68aa48b5eae91b8e4886536ef558ca94e44e
diff --cc src/Makefile-client.am
index 59496fc9f919,ed257cd32e89..62b78c4c3602
--- a/src/Makefile-client.am
+++ b/src/Makefile-client.am
@@@ -61,8 -61,8 +61,9 @@@ endif # WITH_RB
  if WITH_FUSE
  ceph_fuse_SOURCES = ceph_fuse.cc
  ceph_fuse_LDADD = $(LIBCLIENT_FUSE) $(CEPH_GLOBAL)
+ ceph_fuse_CXXFLAGS = $(AM_CXXFLAGS) $(LIBFUSE_CFLAGS)
  bin_PROGRAMS += ceph-fuse
 +sbin_SCRIPTS += mount.fuse.ceph
  
  if WITH_RBD
  rbd_fuse_SOURCES = rbd_fuse/rbd-fuse.cc