rgw: link against system openssl (instead of dlopen at runtime)

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index b93f42df2e7b630d9bc458bb384621a21e2c5e99..0c4d359dfa8f55fe88f58a1d6de5479233e89b44 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -117,6 +117,7 @@ BuildRequires:      libblkid-devel >= 2.17
 BuildRequires: libudev-devel
 BuildRequires: libtool
 BuildRequires: make
+BuildRequires:  openssl-devel
 BuildRequires: parted
 BuildRequires: perl
 BuildRequires: pkgconfig

diff --git a/debian/control b/debian/control
index 49659521d77d2cfc8469bd058889425309144855..8da547a09cca911d398cc4dff39649e6c98d3c1f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,7 @@ Build-Depends: autoconf,
                libleveldb-dev,
                libnss3-dev,
                libsnappy-dev,
+              libssl-dev,
                liblttng-ust-dev,
                libtool,
                libudev-dev,

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index 1d481da96f7783a6853de793e64af7d3b7f2b6dc..f2256e4f2a193b4efa1e954951a6ff5290bf9fb0 100644 (file)
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -244,6 +244,7 @@ CEPH_GLOBAL = $(LIBGLOBAL) $(LIBCOMMON) $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXT
 LIBCOMMON_DEPS =
 LIBRADOS_DEPS =
 LIBRGW_DEPS =
+LIBCIVETWEB_DEPS =
 
 # This is used by the dencoder test
 DENCODER_SOURCES =

diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am
index 3a30156c298030f7d4e45b13bf655350c47888d7..639cb914c0f38513b29d9e938fd1c84b04ac91fd 100644 (file)
--- a/src/rgw/Makefile.am
+++ b/src/rgw/Makefile.am
@@ -75,7 +75,8 @@ libcivetweb_la_SOURCES =  \
        civetweb/src/civetweb.c
 
 libcivetweb_la_CXXFLAGS = ${CIVETWEB_INCLUDE} -Woverloaded-virtual ${AM_CXXFLAGS}
-libcivetweb_la_CFLAGS = -I$(srcdir)/civetweb/include ${CIVETWEB_INCLUDE}
+libcivetweb_la_CFLAGS = -I$(srcdir)/civetweb/include ${CIVETWEB_INCLUDE} -DNO_SSL_DL
+LIBCIVETWEB_DEPS += -lssl
 
 noinst_LTLIBRARIES += libcivetweb.la
 
@@ -99,7 +100,7 @@ radosgw_SOURCES = \
        rgw/rgw_loadgen.cc \
        rgw/rgw_main.cc
 radosgw_CFLAGS = -I$(srcdir)/civetweb/include
-radosgw_LDADD = $(LIBRGW) $(LIBCIVETWEB) $(LIBRGW_DEPS) $(RESOLV_LIBS) $(CEPH_GLOBAL)
+radosgw_LDADD = $(LIBRGW) $(LIBCIVETWEB) $(LIBCIVETWEB_DEPS) $(LIBRGW_DEPS) $(RESOLV_LIBS) $(CEPH_GLOBAL)
 bin_PROGRAMS += radosgw
 
 radosgw_admin_SOURCES = rgw/rgw_admin.cc rgw/rgw_orphan.cc