rpm,cmake: additional fixes to make amqp support optional

Signed-off-by: Tim Serong <tserong@suse.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 482a57110421230a92f55c6409cf1aff1a0befd2..4bc3c122321a10382c3d4402db5898360ae8fa4d 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -187,7 +187,9 @@ BuildRequires:      xfsprogs
 BuildRequires: xfsprogs-devel
 BuildRequires: xmlstarlet
 BuildRequires: yasm
+%if 0%{with amqp_endpoint}
 BuildRequires:  librabbitmq-devel
+%endif
 %if 0%{with make_check}
 BuildRequires:  jq
 BuildRequires: python%{_python_buildid}-bcrypt

diff --git a/src/tools/ceph-dencoder/CMakeLists.txt b/src/tools/ceph-dencoder/CMakeLists.txt
index 7720b879c8f46fa6f1e99726d4ddd0ee00ad6e0e..14370d557a848895c01b7d14369fb2b7ef6a6d2b 100644 (file)
--- a/src/tools/ceph-dencoder/CMakeLists.txt
+++ b/src/tools/ceph-dencoder/CMakeLists.txt
@@ -22,6 +22,10 @@ if(WITH_RADOSGW)
   list(APPEND DENCODER_EXTRALIBS
     rgw_a
     cls_rgw_client)
+  if(WITH_RADOSGW_AMQP_ENDPOINT)
+    list(APPEND DENCODER_EXTRALIBS
+      rabbitmq)
+  endif()
 endif()
 
 if(WITH_RBD)
@@ -56,6 +60,5 @@ target_link_libraries(ceph-dencoder
   cls_journal_client
   cls_timeindex_client
   ${EXTRALIBS}
-  ${CMAKE_DL_LIBS}
-  rabbitmq)
+  ${CMAKE_DL_LIBS})
 install(TARGETS ceph-dencoder DESTINATION bin)