jewel: build/rgw: configure if curl is linked against openssl

Since the Luminous/master change was cmake only, making an explicit autoconf
test.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

diff --git a/configure.ac b/configure.ac
index 5870d19b34ed230be30e9ddd3c71d30d6dceabee..b293a49e71f408699a0dc38a6f8f667e9cb15a3a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -555,6 +555,18 @@ SONAME_DEFINES="$SONAME_DEFINES -DCRYPTO_LIB=\\"'"'"$LIBCRYPTO_SONAME\\"'"'""
 ])
 AC_SUBST(SONAME_DEFINES)
 
+AS_IF([test "$RADOSGW" = "1"],
+      [AC_MSG_CHECKING(if curl links with openssl)
+      AC_CHECK_PROG(CURL_CONFIG, curl-config, yes)
+      if test x"${CURL_CONFIG}" == x"yes"; then
+         if curl-config --configure | grep with-ssl; then
+            AC_DEFINE([WITH_CURL_OPENSSL], [1], [Define if curl is linked with ssl])
+         fi
+      else
+        AC_MSG_WARN([curl-config not found, radosgw's outbound ssl requests may be unreliable])
+      fi
+])
+
 # fuse?
 AC_ARG_WITH([fuse],
             [AS_HELP_STRING([--without-fuse], [disable FUSE userspace client])],

diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am
index cea1218e433886bd36da13280652f538472d3cc3..1fdc087f7d1671849c90a08b6a3ae06ac7195263 100644 (file)
--- a/src/rgw/Makefile.am
+++ b/src/rgw/Makefile.am
@@ -40,6 +40,7 @@ librgw_la_SOURCES = \
        rgw/rgw_frontend.cc \
        rgw/rgw_gc.cc \
        rgw/rgw_http_client.cc \
+       rgw/rgw_http_client_curl.cc \
        rgw/rgw_json_enc.cc \
        rgw/rgw_keystone.cc \
        rgw/rgw_loadgen.cc \
@@ -219,6 +220,7 @@ noinst_HEADERS += \
        rgw/rgw_os_lib.h \
        rgw/rgw_orphan.h \
        rgw/rgw_http_client.h \
+       rgw/rgw_http_client_curl.h \
        rgw/rgw_swift.h \
        rgw/rgw_swift_auth.h \
        rgw/rgw_quota.h \