From: Sage Weil <sage@redhat.com>
Date: Sat, 24 Oct 2015 12:30:12 +0000 (-0400)
Subject: Merge pull request #5954 from rohanmars/wip-rhel59-fixes
X-Git-Tag: v10.0.0~64
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=09d0c8adae670ded30fdc7eb1bcca823267f3070;p=ceph.git

Merge pull request #5954 from rohanmars/wip-rhel59-fixes

rhel 5.9 librados compile fix, moved blkid to RBD check/compilation

Reviewed-by: Sage Weil <sage@redhat.com>
---

09d0c8adae670ded30fdc7eb1bcca823267f3070
diff --cc src/common/Makefile.am
index f98cd18c2de0,3c90d0ec544d..ac47b3396a79
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@@ -73,11 -73,12 +73,13 @@@ libcommon_internal_la_SOURCES = 
  	common/module.c \
  	common/Readahead.cc \
  	common/Cycles.cc \
 -	common/ContextCompletion.cc
 +	common/ContextCompletion.cc \
 +	common/TracepointProvider.cc
  
+ if WITH_RBD
  libcommon_internal_la_SOURCES += \
  	common/blkdev.cc
+ endif
  
  if ENABLE_XIO
  libcommon_internal_la_SOURCES += \