From b7c9fb7cd4563794ad632aafe5c5bfad58e99dba Mon Sep 17 00:00:00 2001 From: "waterson%netscape.com" Date: Thu, 6 Sep 2001 19:13:41 +0000 Subject: [PATCH] Bug 98456. Fix meta-modules on Linux. r=dp, sr=cls. git-svn-id: svn://10.0.0.236/trunk@102428 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/staticmod/Makefile.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mozilla/modules/staticmod/Makefile.in b/mozilla/modules/staticmod/Makefile.in index 4b8aa3666f9..0cc7de32253 100644 --- a/mozilla/modules/staticmod/Makefile.in +++ b/mozilla/modules/staticmod/Makefile.in @@ -81,6 +81,9 @@ 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) endif @@ -96,7 +99,7 @@ nsStaticModule.cpp: nsMetaModule.cpp.in Makefile Makefile.in $(DEPTH)/config/aut rm -f $@ cat $< | \ sed -e "s|%DECLARE_SUBMODULE_INFOS%|$(foreach m, $(MOZ_STATIC_COMPONENTS), extern nsModuleInfo NSMODULEINFO($(m));)|" | \ - sed -e "s|%SUBMODULE_INFOS%|$(foreach m, $(MOZ_STATIC_COMPONENTS), \\& NSMODULEINFO($(m)),)|" | \ + sed -e "s|%SUBMODULE_INFOS%|$(foreach m, $(MOZ_STATIC_COMPONENTS), \\& NSMODULEINFO($(m)),)|" \ > $@ endif @@ -104,5 +107,5 @@ nsMetaModule_%.cpp: nsMetaModule.cpp.in Makefile Makefile.in $(topsrcdir)/config rm -f $@ cat $< | \ sed -e "s|%DECLARE_SUBMODULE_INFOS%|$(foreach m, $($(_META_COMPONENT_NAMES)), extern nsModuleInfo NSMODULEINFO($(m));)|" | \ - sed -e "s|%SUBMODULE_INFOS%|$(foreach m, $($(_META_COMPONENT_NAMES)), \\& NSMODULEINFO($(m)),)|" | \ + sed -e "s|%SUBMODULE_INFOS%|$(foreach m, $($(_META_COMPONENT_NAMES)), \\& NSMODULEINFO($(m)),)|" \ > $@