Skip to content

Commit

Permalink
rgw-ldap: add ldap lib to rgw lib deps based on build config
Browse files Browse the repository at this point in the history
Fixes autotools and Cmake linking on Alpine.

Signed-off-by: John Coyle <dx9err@gmail.com>
  • Loading branch information
dx9 committed Jun 29, 2016
1 parent f7303ce commit b3b3185
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/rgw/Makefile.am
Expand Up @@ -121,7 +121,7 @@ LIBRGW_DEPS += \
-ldl
endif

if FREEBSD
if WITH_OPENLDAP
LIBRGW_DEPS += \
-lldap
endif
Expand Down

0 comments on commit b3b3185

Please sign in to comment.