diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2006-08-28 23:23:59 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2006-08-28 23:23:59 +0000 |
| commit | 855910d56b83314281ae274fd7573635f0d7fa2b (patch) | |
| tree | 20e0f1b963ae4f3e67e2a2d4ac876d2bcbf8d85f /ldap/servers/slapd | |
| parent | 9cc92a20535293b4fd9be90e626d5daccc5d923e (diff) | |
| download | ds-855910d56b83314281ae274fd7573635f0d7fa2b.tar.gz ds-855910d56b83314281ae274fd7573635f0d7fa2b.tar.xz ds-855910d56b83314281ae274fd7573635f0d7fa2b.zip | |
204410 - Pick up new ldapcsdk, nspr, and sasl components
Diffstat (limited to 'ldap/servers/slapd')
| -rw-r--r-- | ldap/servers/slapd/tools/Makefile | 7 | ||||
| -rw-r--r-- | ldap/servers/slapd/tools/ldclt/Makefile | 4 | ||||
| -rw-r--r-- | ldap/servers/slapd/tools/rsearch/Makefile | 4 |
3 files changed, 8 insertions, 7 deletions
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 |