Makefile.am, rgw: remove fcgi dependency where not needed

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>

diff --git a/src/Makefile.am b/src/Makefile.am
index 08e7c38f5a4aedf84d615c83a57b75ed2e88f16a..6e728e66264b262f121a12b34ad88d97a65694ca 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -289,7 +289,7 @@ librgw_la_SOURCES = ${librgw_SOURCES}
 librgw_la_CFLAGS = ${CRYPTO_CFLAGS} ${AM_CFLAGS}
 librgw_la_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
 librgw_la_LIBADD = librados.la
-librgw_la_LDFLAGS = -version-info 1:0:0 $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) -lexpat -lcurl -lfcgi
+librgw_la_LDFLAGS = -version-info 1:0:0 $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) -lexpat -lcurl
 lib_LTLIBRARIES += librgw.la
 
 endif
@@ -335,24 +335,26 @@ my_libradosgw_src = \
        rgw/rgw_fs.cc \
        rgw/rgw_rados.cc \
        rgw/rgw_op.cc \
-       rgw/rgw_rest.cc \
-       rgw/rgw_rest_swift.cc \
-       rgw/rgw_rest_s3.cc \
        rgw/rgw_common.cc \
        rgw/rgw_cache.cc \
-       rgw/rgw_swift.cc \
-       rgw/rgw_swift_auth.cc \
        rgw/rgw_formats.cc \
        rgw/rgw_log.cc \
        rgw/rgw_multi.cc \
        rgw/rgw_env.cc
 
 my_radosgw_ldadd = \
-       libglobal.la librgw.la librados.la -lfcgi -lcurl -lexpat \
+       libglobal.la librgw.la librados.la -lcurl -lexpat \
        $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 
-radosgw_SOURCES = $(my_libradosgw_src) rgw/rgw_main.cc
-radosgw_LDADD = $(my_radosgw_ldadd)
+radosgw_SOURCES = $(my_libradosgw_src) \
+       rgw/rgw_rest.cc \
+       rgw/rgw_rest_swift.cc \
+       rgw/rgw_rest_s3.cc \
+       rgw/rgw_swift.cc \
+       rgw/rgw_swift_auth.cc \
+  rgw/rgw_main.cc
+
+radosgw_LDADD = $(my_radosgw_ldadd) -lfcgi
 radosgw_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
 radosgw_admin_SOURCES = $(my_libradosgw_src) rgw/rgw_admin.cc
 radosgw_admin_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
@@ -629,7 +631,7 @@ check_PROGRAMS += unittest_daemon_config
 if WITH_RADOSGW
 unittest_librgw_SOURCES = test/librgw.cc
 unittest_librgw_LDFLAGS = -lrt $(PTHREAD_CFLAGS) -lcurl ${AM_LDFLAGS}
-unittest_librgw_LDADD =  librgw.la librados.la ${UNITTEST_LDADD} -lexpat -lfcgi $(LIBGLOBAL_LDA)
+unittest_librgw_LDADD =  librgw.la librados.la ${UNITTEST_LDADD} -lexpat $(LIBGLOBAL_LDA)
 unittest_librgw_CXXFLAGS = ${CRYPTO_CFLAGS} ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_librgw
 endif

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index 34effb7908351613fe76d39fc5283208fef3b01e..c38c130f069d2294da50e05f4b2c9709a163c139 100644 (file)
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -255,17 +255,6 @@ req_state::~req_state() {
   free((void *)bucket_name);
 }
 
-void flush_formatter_to_req_state(struct req_state *s, Formatter *formatter)
-{
-  std::ostringstream oss;
-  formatter->flush(oss);
-  std::string outs(oss.str());
-  if (!outs.empty()) {
-    CGI_PutStr(s, outs.c_str(), outs.size());
-  }
-  s->formatter->reset();
-}
-
 std::ostream& operator<<(std::ostream& oss, const rgw_err &err)
 {
   oss << "rgw_err(http_ret=" << err.http_ret << ", s3='" << err.s3_code << "') ";

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 5f50829111f67599bb6afb832226ff1940a51942..7f920166f63055fde4e26d74e1968039fcb2123a 100644 (file)
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -584,9 +584,6 @@ struct req_state {
    ~req_state();
 };
 
-extern void flush_formatter_to_req_state(struct req_state *s,
-                                        ceph::Formatter *formatter);
-
 /** Store basic data on an object */
 struct RGWObjEnt {
   std::string name;

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index 14813282eccdc1d81ed78dffc85176fcc6d536fe..e70dedf4684e26c80eba8c45e13eb5563a28abfd 100644 (file)
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -80,6 +80,17 @@ static const struct rgw_html_errors *search_err(int err_no, const struct rgw_htm
   return NULL;
 }
 
+void flush_formatter_to_req_state(struct req_state *s, Formatter *formatter)
+{
+  std::ostringstream oss;
+  formatter->flush(oss);
+  std::string outs(oss.str());
+  if (!outs.empty()) {
+    CGI_PutStr(s, outs.c_str(), outs.size());
+  }
+  s->formatter->reset();
+}
+
 void set_req_state_err(struct req_state *s, int err_no)
 {
   const struct rgw_html_errors *r;

diff --git a/src/rgw/rgw_rest.h b/src/rgw/rgw_rest.h
index 228267d86beea44726188fa0788da10b2d52f65a..b0ba54965fac0ca896f164ca81bceb35e152e135 100644 (file)
--- a/src/rgw/rgw_rest.h
+++ b/src/rgw/rgw_rest.h
@@ -4,6 +4,9 @@
 
 #include "rgw_op.h"
 
+extern void flush_formatter_to_req_state(struct req_state *s,
+                                        ceph::Formatter *formatter);
+
 
 class RGWGetObj_REST : public RGWGetObj
 {