Skip to content

Commit

Permalink
FreeBSD/src/rgw/Makefile.am: Fix the inclusion of libs
Browse files Browse the repository at this point in the history
 - 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 <wjw@digiware.nl>
  • Loading branch information
wjwithagen committed May 10, 2016
1 parent 7908f8d commit a4c7e13
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions src/rgw/Makefile.am
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down

0 comments on commit a4c7e13

Please sign in to comment.