From d06c1d709779345bf9416f5deb3d284224e4d70e Mon Sep 17 00:00:00 2001
From: Rohan Mars <code@rohanmars.com>
Date: Sun, 15 Mar 2015 12:28:06 -0700
Subject: [PATCH] rhel 5.9 port fixes to compile librados only Signed-off-by:
 Rohan Mars <code@rohanmars.com>

---
 configure.ac           | 8 ++++++--
 src/Makefile-env.am    | 2 +-
 src/common/Makefile.am | 6 +++++-
 src/mon/MonCap.cc      | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index a035fc46ae7f8..6528abd96d1ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,6 +242,7 @@ AC_DEFUN([AC_CHECK_CC_FLAG],
 
 AC_CHECK_CC_FLAG([-Wtype-limits], [WARN_TYPE_LIMITS])
 AC_CHECK_CC_FLAG([-Wignored-qualifiers], [WARN_IGNORED_QUALIFIERS])
+AC_CHECK_CC_FLAG([-Werror=format-security], [WARN_ERROR_FORMAT_SECURITY])
 
 # Check for compiler VTA support
 AX_CHECK_COMPILE_FLAG([-fvar-tracking-assignments], [HAS_VTA_SUPPORT=1], [HAS_VTA_SUPPORT=0])
@@ -257,7 +258,7 @@ ACX_PTHREAD
 AC_CHECK_LIB([uuid], [uuid_parse], [true], AC_MSG_FAILURE([libuuid not found]))
 
 # rbd {map,unmap,showmapped} dependencies, Linux only
-if test x"$linux" = x"yes"; then
+if test x"$linux" = x"yes" -a x"$with_rbd" = x"yes"; then
   # libblkid
   AC_CHECK_HEADER([blkid/blkid.h], [],
     AC_MSG_ERROR([blkid/blkid.h not found (libblkid-dev, libblkid-devel)]))
@@ -645,7 +646,7 @@ fi
 #
 # FreeBSD has it in base.
 #
-if test x"$freebsd" != x"yes"; then
+if test x"$freebsd" != x"yes" -a x"$with_radosgw" = x"yes"; then
 PKG_CHECK_MODULES([LIBEDIT], [libedit >= 2.11],
                 [], AC_MSG_FAILURE([No usable version of libedit found.]))
 else
@@ -966,6 +967,7 @@ AC_MSG_RESULT([no])
 ])
 
 AC_MSG_CHECKING([for sched.h])
++AC_LANG_PUSH([C++])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #define _GNU_SOURCE
 #include <sched.h>
@@ -982,6 +984,8 @@ AC_DEFINE([HAVE_SCHED], 1, [Define to 1 if you have sched.h.])
 ], [
 AC_MSG_RESULT([no])
 ])
++AC_LANG_POP([C++])
+
 
 #
 # Check for pthread spinlock (depends on ACX_PTHREAD)
diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index aca2d399d449a..ea7eabc7afce5 100644
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -64,7 +64,7 @@ AM_COMMON_CFLAGS = \
 	${WARN_IGNORED_QUALIFIERS} \
 	-Winit-self \
 	-Wpointer-arith \
-	-Werror=format-security \
+	${WARN_ERROR_FORMAT_SECURITY} \
 	-fno-strict-aliasing \
 	-fsigned-char
 if !CLANG
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index a0736ba821fa1..78afd5e9d88a4 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -33,7 +33,6 @@ libcommon_internal_la_SOURCES = \
 	common/str_map.cc \
 	common/errno.cc \
 	common/RefCountedObj.cc \
-	common/blkdev.cc \
 	common/common_init.cc \
 	common/pipe.c \
 	common/ceph_argparse.cc \
@@ -76,6 +75,11 @@ libcommon_internal_la_SOURCES = \
 	common/Cycles.cc \
 	common/ContextCompletion.cc
 
+if WITH_RBD
+libcommon_internal_la_SOURCES += \
+	common/blkdev.cc
+endif
+
 if ENABLE_XIO
 libcommon_internal_la_SOURCES += \
 	common/address_helper.cc
diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc
index 059eeabf01168..307e0f308a2e9 100644
--- a/src/mon/MonCap.cc
+++ b/src/mon/MonCap.cc
@@ -13,10 +13,10 @@
  */
 
 #include <boost/config/warning_disable.hpp>
+#include <boost/spirit/include/qi_uint.hpp>
 #include <boost/spirit/include/qi.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 #include <boost/spirit/include/phoenix.hpp>
-#include <boost/spirit/include/qi_uint.hpp>
 #include <boost/fusion/adapted/struct/adapt_struct.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
 
-- 
2.39.5