bug 394190 - seamonkey/thunderbird not starting up due to manifest embedding issues. change manifest embedding in the non-libxul case. r=bsmedberg, a=bz

accessible/public/ia2/Makefile.in

@@ -99,6 +99,8 @@ MIDL_GENERATED_FILES = \
   $(MIDL_ENUMS:%.idl=%.h) \
   $(NULL)
 
+EMBED_MANIFEST_AT = 2
+
 include $(topsrcdir)/config/rules.mk
 
 OS_LIBS = \

accessible/public/msaa/Makefile.in

@@ -119,5 +119,7 @@ export:: done_gen
 register::
 	regsvr32 -s $(DIST)/bin/$(SHARED_LIBRARY)
 
+EMBED_MANIFEST_AT = 2
+
 include $(topsrcdir)/config/rules.mk
 

config/rules.mk

@@ -163,6 +163,10 @@ ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
 IMPORT_LIBRARY		:= $(LIB_PREFIX)$(LIBRARY_NAME).$(IMPORT_LIB_SUFFIX)
 endif
 
+ifeq ($(MOZ_ENABLE_LIBXUL),1)
+EMBED_MANIFEST_AT=2
+endif
+
 endif # MKSHLIB
 endif # FORCE_SHARED_LIB && !BUILD_STATIC_LIBS
 endif # LIBRARY
@@ -1069,10 +1073,12 @@ endif # NO_LD_ARCHIVE_FLAGS
 	$(MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 ifdef MSMANIFEST_TOOL
+ifdef EMBED_MANIFEST_AT
 	@if test -f $@.manifest; then \
-		mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;2; \
+		mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \
 		rm -f $@.manifest; \
 	fi
+endif   # EMBED_MANIFEST_AT
 endif	# MSVC with manifest tool
 endif	# WINNT && !GCC
 ifeq ($(OS_ARCH),Darwin)

embedding/browser/activex/src/control/Makefile.in

@@ -114,6 +114,8 @@ GARBAGE	+= $(DEFFILE) $(MIDL_GENERATED_FILES) done_gen
 
 ENABLE_CXX_EXCEPTIONS = 1
 
+EMBED_MANIFEST_AT = 2
+
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += -D "WIN32" -U "ClientWallet"

embedding/browser/activex/src/control_kicker/Makefile.in

@@ -61,9 +61,11 @@ OS_LIBS	+= \
 	uuid.lib \
 	shell32.lib \
 	$(NULL)
-	
+
 ENABLE_CXX_EXCEPTIONS = 1
 
+EMBED_MANIFEST_AT = 2
+
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += -D "WIN32" -GF -MT -O1