jewel: fix compile error for dencode test case when --with-radosgw=no

If cannot disable radosgw, the user has to always compile radosgw part,
even only want to use block device or file storage. Cherry-pick cannot
be done because ceph master doesn't have Makefile.am any more.

Fixes: http://tracker.ceph.com/issues/18512
Signed-off-by: Pan Liu <pan.liu@istuary.com>

diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am
index b083dd1022b8dee3425125a3cc26d5fdf595d3df..4a6017373470d9ee1a636ef23eb83ebaf152a6d9 100644 (file)
--- a/src/rgw/Makefile.am
+++ b/src/rgw/Makefile.am
@@ -1,5 +1,6 @@
 if ENABLE_CLIENT
-
+if WITH_RADOS
+if WITH_RADOSGW
 # inject rgw stuff in the decoder testcase
 DENCODER_SOURCES += \
        rgw/rgw_dencoder.cc \
@@ -18,9 +19,6 @@ DENCODER_DEPS += -lcurl -lexpat \
        libcls_timeindex_client.la \
        libcls_statelog_client.la
 
-if WITH_RADOS
-if WITH_RADOSGW
-
 librgw_la_SOURCES = \
        rgw/rgw_acl.cc \
        rgw/rgw_acl_s3.cc \

diff --git a/src/test/Makefile-client.am b/src/test/Makefile-client.am
index 6eade231ff8d9a07a131b3fbcd99d1729b898e17..0e1fc82f90e44ee0f86283ad00aef898cb6c61d8 100644 (file)
--- a/src/test/Makefile-client.am
+++ b/src/test/Makefile-client.am
@@ -3,7 +3,6 @@ ceph_dencoder_SOURCES = \
        test/encoding/ceph_dencoder.cc \
        $(DENCODER_SOURCES)
 ceph_dencoder_LDADD = \
-       $(LIBRGW) \
        $(LIBRADOS) \
        $(LIBRBD_TYPES) \
        $(LIBOSD_TYPES) \
@@ -26,6 +25,9 @@ ceph_dencoder_CXXFLAGS += -DWITH_RBD
 endif
 if WITH_RADOSGW
 ceph_dencoder_CXXFLAGS += -DWITH_RADOSGW
+ceph_dencoder_LDADD += \
+       $(LIBRGW) \
+       $(LIBRGW_DEPS) 
 endif