From ae660cedf5cfde62d7a366aae0b36426d95d8a0c Mon Sep 17 00:00:00 2001 From: "richm%stanfordalumni.org" Date: Tue, 10 May 2005 20:08:48 +0000 Subject: [PATCH] fix for 291993: find the NSPR libraries in the correct location in the dist build tree and make prldap have a run time dependency on them git-svn-id: svn://10.0.0.236/trunk@173259 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in | 4 +++- mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in b/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in index a07e47160f8..2d426afaf0c 100644 --- a/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in +++ b/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in @@ -117,7 +117,9 @@ endif ifeq ($(OS_ARCH), SunOS) EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -EXTRA_LIBS += -L$(dist_libdir) $(DYNAMICNSPR) +# NSPR, NSS, etc. other mozilla components do not put their shared libs +# in dist_libdir but rather in $(DIST)/$(RELEASE_OBJDIR_NAME)/lib +EXTRA_LIBS += -L$(DIST)/$(RELEASE_OBJDIR_NAME)/lib $(DYNAMICNSPR) endif ifeq ($(OS_ARCH), WINNT) diff --git a/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in b/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in index 6b2989b284b..1d6916a6092 100644 --- a/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in +++ b/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in @@ -105,7 +105,9 @@ endif # USE_DLL_EXPORTS_FILE ifeq ($(OS_ARCH), SunOS) EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -EXTRA_LIBS += $(DYNAMICNSPR) +# NSPR, NSS, etc. other mozilla components do not put their shared libs +# in dist_libdir but rather in $(DIST)/$(RELEASE_OBJDIR_NAME)/lib +EXTRA_LIBS += -L$(DIST)/$(RELEASE_OBJDIR_NAME)/lib $(DYNAMICNSPR) endif ifeq ($(OS_ARCH), WINNT)