Bug 714495 - Port - |Microsoft.VC80.CRT SideBySide errors, browsercomps.dll| to comm. r+a=Standard8
--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -37,16 +37,19 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
+# NOTE: if we switch away from LIBXUL_LIBRARY at any stage
+# we need to clear the EMBED_MANIFEST_AT flag. (See Bug 714495)
+
MODULE = mailcomps
LIBRARY_NAME = mailcomps
SHORT_LIBNAME = mailcmp
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsMailCompsModule
LIBXUL_LIBRARY = 1
MOZILLA_INTERNAL_API = 1
--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@@ -88,8 +88,11 @@ EXTRA_DSO_LDOPTS += \
# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += \
$(TK_LIBS) \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk
+
+# Ensure that we don't embed a manifest referencing the CRT.
+EMBED_MANIFEST_AT =