From f5a2df2eca71b9b9ad02363863049ba850a71976 Mon Sep 17 00:00:00 2001
From: "jdunn%netscape.com" <jdunn%netscape.com>
Date: Fri, 15 Dec 2000 12:58:07 +0000
Subject: [PATCH] fix unresolved symbol for nsUInt32Array by linking in
 libmsgbaseutil. Also combine NSPR_LIBS & XPCOM_LIBS to just use
 MOZ_COMPONENT_LIBS

r= cls@seawood.org
# 62884
---
 mailnews/import/src/Makefile.in | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mailnews/import/src/Makefile.in b/mailnews/import/src/Makefile.in
index a71f4656fe2d..4f91d4ee94f8 100644
--- a/mailnews/import/src/Makefile.in
+++ b/mailnews/import/src/Makefile.in
@@ -31,6 +31,12 @@ LIBRARY_NAME = import
 IS_COMPONENT	= 1
 REQUIRES	= xpcom mailnews addrbook uconv mork msgbase msgbaseutil profile intl locale necko rdf msgdb rdfutil
 
+ifeq ($(USE_SHORT_LIBNAME),1)
+EXTRA_DSO_LIBS = msgbutil
+else
+EXTRA_DSO_LIBS = msgbaseutil
+endif
+
 CPPSRCS		= 	\
 			nsImportFactory.cpp 			\
 			nsImportService.cpp				\
@@ -54,8 +60,8 @@ include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += \
 	-L$(DIST)/bin \
-	$(NSPR_LIBS) \
-	$(XPCOM_LIBS) \
+	$(MOZ_COMPONENT_LIBS) \
+	$(EXTRA_DSO_LIBS) \
 	$(NULL)