Bug 762621 - Force loading NSPR before prldap60. r=Standard8
--- a/mail/extradependlibs.mk
+++ b/mail/extradependlibs.mk
@@ -5,12 +5,15 @@
# This file is included from mozilla/xpcom/stub/Makefile.in
# Presume all mozilla/autoconf.mk is included and that it does not have
# Direct access to c-c specific vars not present there.
# We don't have access to MOZ_LDAP_XPCOM here, so cheat.
ifneq (,$(findstring ldap,$(MOZ_APP_COMPONENT_LIBS)))
DEPENDENT_LIBS_LIST += \
$(DLL_PREFIX)ldap60$(DLL_SUFFIX) \
+ $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
+ $(DLL_PREFIX)plc4$(DLL_SUFFIX) \
+ $(DLL_PREFIX)plds4$(DLL_SUFFIX) \
$(DLL_PREFIX)prldap60$(DLL_SUFFIX) \
$(DLL_PREFIX)ldif60$(DLL_SUFFIX) \
$(NULL)
endif
--- a/suite/extradependlibs.mk
+++ b/suite/extradependlibs.mk
@@ -5,12 +5,15 @@
# This file is included from mozilla/xpcom/stub/Makefile.in
# Presume all mozilla/autoconf.mk is included and that it does not have
# Direct access to c-c specific vars not present there.
# We don't have access to MOZ_LDAP_XPCOM here, so cheat.
ifneq (,$(findstring ldap,$(MOZ_APP_COMPONENT_LIBS)))
DEPENDENT_LIBS_LIST += \
$(DLL_PREFIX)ldap60$(DLL_SUFFIX) \
+ $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
+ $(DLL_PREFIX)plc4$(DLL_SUFFIX) \
+ $(DLL_PREFIX)plds4$(DLL_SUFFIX) \
$(DLL_PREFIX)prldap60$(DLL_SUFFIX) \
$(DLL_PREFIX)ldif60$(DLL_SUFFIX) \
$(NULL)
endif