From c1d38ca5468e96be276135fc6ed79bda4823932a Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Apr 06 2018 21:14:23 +0000 Subject: Ticket 49552 - Fix the last of the build issues on F28/29 Description: Add missing NSPR/NSS libs for libsrvcore, and add libldaputil to ns-slapd dependancies. Thanks to Matus for figuring outthe ns-slapd dependacnies part!! https://pagure.io/389-ds-base/issue/49552 Reviewed by: mreynolds & mhonek (one line commit rule) --- diff --git a/Makefile.am b/Makefile.am index c0987ff..f55c317 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1165,6 +1165,7 @@ libsvrcore_la_SOURCES = \ libsvrcore_la_LDFLAGS = $(AM_LDFLAGS) libsvrcore_la_CPPFLAGS = $(AM_CPPFLAGS) $(SVRCORE_INCLUDES) $(DSPLUGIN_CPPFLAGS) +libsvrcore_la_LIBADD = $(NSS_LINK) $(NSPR_LINK) #------------------------ # libsds @@ -2118,7 +2119,7 @@ ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \ ns_slapd_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(SASL_INCLUDES) $(SVRCORE_INCLUDES) ns_slapd_LDADD = libnunc-stans.la libslapd.la libldaputil.la libsvrcore.la $(LDAPSDK_LINK) $(NSS_LINK) $(LIBADD_DL) \ $(NSPR_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) $(THREADLIB) $(SYSTEMD_LINK) $(EVENT_LINK) -ns_slapd_DEPENDENCIES = libslapd.la libnunc-stans.la +ns_slapd_DEPENDENCIES = libslapd.la libnunc-stans.la libldaputil.la # We need to link ns-slapd with the C++ compiler on HP-UX since we load # some C++ shared libraries (such as icu). if HPUX