From b3b3185008a0a2149dcba59813e0f0400d2e47de Mon Sep 17 00:00:00 2001 From: John Coyle Date: Mon, 21 Mar 2016 10:03:56 -0400 Subject: [PATCH] rgw-ldap: add ldap lib to rgw lib deps based on build config Fixes autotools and Cmake linking on Alpine. Signed-off-by: John Coyle --- src/CMakeLists.txt | 4 ++-- src/rgw/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 48cdf981fb5b2..31aaf1a084bee 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1428,7 +1428,7 @@ if(${WITH_RADOSGW}) add_library(rgw_a STATIC ${rgw_a_srcs}) target_link_libraries(rgw_a librados cls_rgw_client cls_refcount_client cls_log_client cls_statelog_client cls_timeindex_client cls_version_client - cls_replica_log_client cls_user_client curl global expat) + cls_replica_log_client cls_user_client curl global expat ${OPENLDAP_LIBS}) set(radosgw_srcs rgw/rgw_fcgi_process.cc @@ -1483,7 +1483,7 @@ if(${WITH_RADOSGW}) cls_log_client cls_statelog_client cls_timeindex_client cls_version_client cls_replica_log_client cls_user_client curl expat global fcgi resolv ${SSL_LIBRARIES} ${BLKID_LIBRARIES} - ${OPENLDAP_LIBS} ${ALLOC_LIBS}) + ${ALLOC_LIBS}) # radosgw depends on cls libraries at runtime, but not as link dependencies add_dependencies(radosgw cls_rgw cls_lock cls_refcount cls_log cls_statelog cls_timeindex diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am index 59179c217711d..001d9ae621306 100644 --- a/src/rgw/Makefile.am +++ b/src/rgw/Makefile.am @@ -121,7 +121,7 @@ LIBRGW_DEPS += \ -ldl endif -if FREEBSD +if WITH_OPENLDAP LIBRGW_DEPS += \ -lldap endif -- 2.39.5