204410 - Pick up new ldapcsdk, nspr, and sasl components

6 files changed, 15 insertions, 14 deletions

diff --git a/ldap/admin/src/Makefile b/ldap/admin/src/Makefile
index d7c49358..e7d43c48 100644
--- a/ldap/admin/src/Makefile
+++ b/ldap/admin/src/Makefile
@@ -77,7 +77,7 @@ DYNAMIC_DEPLIBS=$(LDAP_COMMON_LIBS_DEP)
 DYNAMIC_DEPLINK=$(LDAP_ADMLIB) $(LDAP_COMMON_LIBS)
 endif
 
-EXTRA_LIBS_DEP += $(NSPR_DEP) $(LDAPSDK_DEP)
+EXTRA_LIBS_DEP += $(NSPR_DEP) $(LDAPSDK_DEP) $(SASL_DEP)
 ifeq ($(USE_ADMINSERVER), 1)
   EXTRA_LIBS_DEP += $(ADMINUTIL_DEP)
 endif
@@ -98,7 +98,7 @@ EXTRA_LIBS += $(SECURITYLINK) $(NSPRLINK)
 ifeq ($(USE_SETUPUTIL), 1)
   EXTRA_LIBS += $(SETUPUTIL_S_LINK)
 endif
-EXTRA_LIBS += $(ICULINK) $(OLD_EXTRA_LIBS)
+EXTRA_LIBS += $(ICULINK) $(SASL_LINK) $(OLD_EXTRA_LIBS)
 
 # these are the libraries to use when building the installer for the open source version
 OPENSOURCE_LIBS = $(LDAP_ADMLIB) $(LDAP_NOSSL_LINK) $(SECURITYLINK) $(NSPRLINK)
diff --git a/ldap/clients/dsgw/Makefile b/ldap/clients/dsgw/Makefile
index 037b1f8d..085cb92d 100644
--- a/ldap/clients/dsgw/Makefile
+++ b/ldap/clients/dsgw/Makefile
@@ -150,18 +150,18 @@ LIBS := $(DISTLIBFLAG) $(LINKOPTIONS) $(LIBLDAPU) $(LDAPLINK) \
 	$(ADMINUTIL_LINK) $(DYN_NSHTTPD) \
 	$(LDAP_LIBLDBM) $(ICULINK) $(NSPRLINK) \
 	$(LDAP_LIBLDIF) $(ALIBS) $(DBMLINK) $(SECURITYLINK) \
-	$(THREADSLIB) $(NSPRLINK) $(LDAP_LIBLITEKEY)
+	$(SASL_LINK) $(THREADSLIB) $(NSPRLINK) $(LDAP_LIBLITEKEY)
 LIBS_DEP = $(LIBLDAPU_DEP) $(LDAP_LIBLDBM_DEP) $(LDAP_LIBLDIF_DEP)
-LIBS_DEP += $(LDAPSDK_DEP) $(ICU_DEP) $(NSPR_DEP) $(DB_LIB_DEP)
+LIBS_DEP += $(LDAPSDK_DEP) $(SASL_DEP) $(ICU_DEP) $(NSPR_DEP) $(DB_LIB_DEP)
 NSECLIBS = $(DISTLIBFLAG) $(SSLLIBFLAG) $(LINKOPTIONS) $(LIBLDAPU) \
 	$(LDAP_NOSSL_LINK) $(ADMINUTIL_LINK) \
 	$(LDAP_LIBLDBM) $(ICULINK) $(NOSSLLIBS) \
-	$(LDAP_LIBLDIF) $(DBMLINK) $(ALIBS) \
+	$(LDAP_LIBLDIF) $(SASL_LINK) $(DBMLINK) $(ALIBS) \
 	$(THREADSLIB) $(NSPRLINK) $(LDAP_LIBLITEKEY)
 endif
 
 NSECLIBS_DEP=$(SECGLUEOBJS)
-NSECLIBS_DEP += $(ICU_DEP)
+NSECLIBS_DEP += $(ICU_DEP) $(SASL_DEP)
 
 #EXTRA_LIBS += -l$(LIBARES)
 
diff --git a/ldap/cm/newinst/Makefile b/ldap/cm/newinst/Makefile
index 890f8375..321cc3c8 100644
--- a/ldap/cm/newinst/Makefile
+++ b/ldap/cm/newinst/Makefile
@@ -171,7 +171,7 @@ $(BINDEST)/uninstall: uninstall
 $(BINDEST)/ns-config: $(OBJS1) $(OBJS2)
 	$(PURIFY) $(CXX) $(SHARED_FLAG) $(CFLAGS) $(MCC_INCLUDE) $(INCDIR) \
 		-o $(BINDEST)/ns-config $(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) $(OBJS1) $(OBJS2) $(SETUPUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \
-	       $(EXTRA_LIBS) $(CURSES)
+	       $(SASL_LINK) $(EXTRA_LIBS) $(CURSES)
 
 $(RELDIR)/shared/bin/%: sec_tools_wrapper $(RELDIR)/shared/bin
 	-@$(RM) $@
diff --git a/ldap/servers/slapd/tools/Makefile b/ldap/servers/slapd/tools/Makefile
index 689231c3..fc163462 100644
--- a/ldap/servers/slapd/tools/Makefile
+++ b/ldap/servers/slapd/tools/Makefile
@@ -105,14 +105,15 @@ DEPLIBS=
 EXTRA_LIBS_DEP = $(LDAPSDK_DEP) \
 	$(LDAP_LIBLDIF_DEP) \
 	$(LDAP_SLIBLCACHE_DEP) $(DB_LIB_DEP) $(LIBSLAPD_DEP) \
-	$(LDAP_COMMON_LIBS_DEP)
+	$(LDAP_COMMON_LIBS_DEP) $(SASL_DEP)
 
 EXTRA_LIBS += $(LDAPLINK) \
 	$(LDAP_SLIBLCACHE) $(DB_LIB) \
 	$(PLATFORM_SPECIFIC_EXTRA_LIBRARY) $(LIBSLAPD) $(LDAP_LIBLITEKEY) \
 	$(ALIBS) \
 	$(SECURITYLINK) $(DBMLINK) \
-	$(THREADSLIB) $(LDAP_COMMON_LIBS) $(NSPRLINK) $(SVRCORELINK)
+	$(THREADSLIB) $(LDAP_COMMON_LIBS) $(NSPRLINK) $(SVRCORELINK) \
+	$(SASL_LINK)
 
 ifeq ($(ARCH), Linux)
 EXTRA_LIBS += -lcrypt
@@ -180,7 +181,7 @@ all:	$(OBJDEST) $(BINDIR) $(LDAP_ADMIN_BIN_RELDIR) $(BINS) buildRsearch buildLdc
 extras:	$(OBJDEST) $(BINDIR) $(EGGENCODE)
 
 $(LDIF):	$(OBJDEST)/ldif.o $(LDAP_LIBLDIF_DEP)
-	$(LINK_EXE) $< $(LDAP_LIBLDIF)
+	$(LINK_EXE) $< $(LDAP_LIBLDIF) $(SASL_LINK)
 
 $(PWDHASH):	$(OBJS1) $(EXTRA_LIBS_DEP)
 	$(LINK_EXE) $(OBJS1) $(EXTRA_LIBS) 
diff --git a/ldap/servers/slapd/tools/ldclt/Makefile b/ldap/servers/slapd/tools/ldclt/Makefile
index 687950f0..d4a636a9 100644
--- a/ldap/servers/slapd/tools/ldclt/Makefile
+++ b/ldap/servers/slapd/tools/ldclt/Makefile
@@ -61,12 +61,12 @@ else
 OBJEXT          =.o
 endif
 
-EXTRA_LIBS_DEP = $(LDAPSDK_DEP) $(DB_LIB_DEP) $(LDAP_COMMON_LIBS_DEP)
+EXTRA_LIBS_DEP = $(LDAPSDK_DEP) $(DB_LIB_DEP) $(LDAP_COMMON_LIBS_DEP) $(SASL_DEP)
 
 EXTRA_LIBS += $(LDAPLINK) $(DB_LIB) \
 	$(PLATFORM_SPECIFIC_EXTRA_LIBRARY) \
 	$(ALIBS) $(NSPRLINK) $(SECURITYLINK) \
-	$(THREADSLIB) $(LDAP_COMMON_LIBS)
+	$(THREADSLIB) $(LDAP_COMMON_LIBS) $(SASL_LINK)
 
 LDCLTSRC	= \
 		data.c \
diff --git a/ldap/servers/slapd/tools/rsearch/Makefile b/ldap/servers/slapd/tools/rsearch/Makefile
index 156d567a..c265489f 100644
--- a/ldap/servers/slapd/tools/rsearch/Makefile
+++ b/ldap/servers/slapd/tools/rsearch/Makefile
@@ -63,12 +63,12 @@ else # OSF1
 PLATFORM_SPECIFIC_EXTRA_LIBRARY =
 endif # OSF1
 
-EXTRA_LIBS_DEP = $(LDAPSDK_DEP) $(DB_LIB_DEP) $(LDAP_COMMON_LIBS_DEP)
+EXTRA_LIBS_DEP = $(LDAPSDK_DEP) $(DB_LIB_DEP) $(LDAP_COMMON_LIBS_DEP) $(SASL_DEP)
 
 EXTRA_LIBS += $(LDAPLINK) $(DB_LIB) \
 	$(PLATFORM_SPECIFIC_EXTRA_LIBRARY) \
 	$(ALIBS) $(NSPRLINK) $(SECURITYLINK) \
-	$(THREADSLIB) $(LDAP_COMMON_LIBS) 
+	$(THREADSLIB) $(LDAP_COMMON_LIBS)  $(SASL_LINK)
 
 ifeq ($(ARCH), Linux)
 EXTRA_LIBS += -lcrypt