From a4c7e13d17ceff3ee15fc311c2a344cd4573821d Mon Sep 17 00:00:00 2001 From: Willem Jan Withagen Date: Thu, 24 Mar 2016 13:08:10 +0100 Subject: [PATCH] FreeBSD/src/rgw/Makefile.am: Fix the inclusion of libs - FreeBSD does not require -ldl - FreeBSD does require -lldap if rgw is build --with-ldap rgw/Makefile.am: Cluster all conditional LIBRGW_DEPS - cosmic change Signed-off-by: Willem Jan Withagen --- src/rgw/Makefile.am | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am index c96e8c5d164..4683e63e4b4 100644 --- a/src/rgw/Makefile.am +++ b/src/rgw/Makefile.am @@ -93,6 +93,7 @@ librgw_la_SOURCES = \ if WITH_OPENLDAP librgw_la_SOURCES += rgw/rgw_ldap.cc + endif librgw_la_CXXFLAGS = -Woverloaded-virtual -fPIC -I$(srcdir)/xxHash \ @@ -113,8 +114,17 @@ LIBRGW_DEPS += \ -lcurl \ -lexpat \ -lm \ - -lfcgi \ - -ldl + -lfcgi + +if LINUX +LIBRGW_DEPS += \ + -ldl +endif + +if FREEBSD +LIBRGW_DEPS += \ + -lldap +endif librgw_la_LIBADD = $(LIBRGW_DEPS) \ $(PTHREAD_LIBS) $(RESOLV_LIBS) libglobal.la \ -- 2.47.3