From 240e36124f4b937ad1c2dff41b705ae6cf62b473 Mon Sep 17 00:00:00 2001
From: "seawood%netscape.com"
 <seawood%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 5 Mar 2002 08:10:54 +0000
Subject: [PATCH] Resolve symbols at link-time. Fixing linux & osx
 --enable-meta-components bustage. Bug #128364 r=bryner a=asa

git-svn-id: svn://10.0.0.236/trunk@115805 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/staticmod/Makefile.in | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/mozilla/modules/staticmod/Makefile.in b/mozilla/modules/staticmod/Makefile.in
index 354dc8b336e..ad454da1ef3 100644
--- a/mozilla/modules/staticmod/Makefile.in
+++ b/mozilla/modules/staticmod/Makefile.in
@@ -81,15 +81,25 @@ EXTRA_DSO_LDOPTS += \
 		-ljsdom
 endif
 
-#EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-
 ifdef MOZ_META_COMPONENTS
 # Force XPCOM_TRANSLATE_NSGM_ENTRY_POINT to be defined so the macros
 # in nsIGenericFactory.h will come out in the wash.
 DEFINES += -DMETA_MODULE=\"$(LIBRARY_NAME)\" -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT
-ifeq ($(LIBRARY_NAME),meta_crypto)
-EXTRA_LIBS += $(NSS_LIBS)
+ifeq ($(LIBRARY_NAME),meta_mail)
+EXTRA_DSO_LDOPTS += \
+	$(DIST)/lib/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
+	$(NULL)
 endif
+ifeq ($(LIBRARY_NAME),meta_crypto)
+EXTRA_DSO_LDOPTS += \
+	$(MOZ_JS_LIBS) \
+	$(NSS_LIBS) \
+	$(NULL)
+endif
+EXTRA_DSO_LDOPTS += \
+	$(MOZ_UNICHARUTIL_LIBS) \
+	$(MOZ_COMPONENT_LIBS) \
+	$(NULL)
 endif
 
 GARBAGE += $(CPPSRCS)