From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 10 Jul 2013 15:15:00 +0000 (+0200)
Subject: Makefile.am: fix build, use $(CRYPTO_LIBS)
X-Git-Tag: v0.67-rc1~125^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc99a23d05f450a2c0b678a85013b2fd9c5f4c9c;p=ceph.git

Makefile.am: fix build, use $(CRYPTO_LIBS)

Use $(CRYPTO_LIBS) instead of -lcryptopp to work also with
nss crypto lib.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index bc8efa513a28..06d96e059ae9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -989,21 +989,21 @@ bin_DEBUGPROGRAMS += ceph_test_cors
 
 cls_test_rgw_meta_SOURCES = test/test_rgw_admin_meta.cc
 cls_test_rgw_meta_LDFLAGS = libglobal.la 
-cls_test_rgw_meta_LDADD = librgw.a ${UNITTEST_LDADD} ${UNITTEST_STATIC_LDADD} -lcryptopp -lcurl -luuid -lexpat  librados.la libcls_version_client.a \
+cls_test_rgw_meta_LDADD = librgw.a ${UNITTEST_LDADD} ${UNITTEST_STATIC_LDADD} $(CRYPTO_LIBS) -lcurl -luuid -lexpat  librados.la libcls_version_client.a \
  libcls_log_client.a libcls_statelog_client.a libcls_refcount_client.a libcls_rgw_client.a libcls_lock_client.a
 cls_test_rgw_meta_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 bin_DEBUGPROGRAMS += cls_test_rgw_meta
 
 cls_test_rgw_log_SOURCES = test/test_rgw_admin_log.cc
 cls_test_rgw_log_LDFLAGS = libglobal.la 
-cls_test_rgw_log_LDADD = librgw.a ${UNITTEST_LDADD} ${UNITTEST_STATIC_LDADD} -lcryptopp -lcurl -luuid -lexpat  librados.la libcls_version_client.a \
+cls_test_rgw_log_LDADD = librgw.a ${UNITTEST_LDADD} ${UNITTEST_STATIC_LDADD} $(CRYPTO_LIBS) -lcurl -luuid -lexpat  librados.la libcls_version_client.a \
  libcls_log_client.a libcls_statelog_client.a libcls_refcount_client.a libcls_rgw_client.a libcls_lock_client.a
 cls_test_rgw_log_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 bin_DEBUGPROGRAMS += cls_test_rgw_log
 
 cls_test_rgw_opstate_SOURCES = test/test_rgw_admin_opstate.cc
 cls_test_rgw_opstate_LDFLAGS = libglobal.la 
-cls_test_rgw_opstate_LDADD = librgw.a ${UNITTEST_LDADD} ${UNITTEST_STATIC_LDADD} -lcryptopp -lcurl -luuid -lexpat  librados.la libcls_version_client.a \
+cls_test_rgw_opstate_LDADD = librgw.a ${UNITTEST_LDADD} ${UNITTEST_STATIC_LDADD} $(CRYPTO_LIBS) -lcurl -luuid -lexpat  librados.la libcls_version_client.a \
  libcls_log_client.a libcls_statelog_client.a libcls_refcount_client.a libcls_rgw_client.a libcls_lock_client.a
 cls_test_rgw_opstate_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 bin_DEBUGPROGRAMS += cls_test_rgw_opstate