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>

diff --cc configure.ac
Simple merge

diff --cc src/common/Makefile.am
index f98cd18c2de001264e4d43c47e99e7e21bbc1dad,3c90d0ec544d6969a09ef99c09b0e621912f881d..ac47b3396a79a3bcb6915303e5164ee971b166a1
--- 1/src/common/Makefile.am
--- 2/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 += \