From 70fc65c92551627b4d655dbc129553c9d5024183 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Tue, 20 Mar 2012 03:05:20 +0100
Subject: [PATCH] Bug 735810. (Cv1) Stop trying to package MSVC dlls when
 WIN32_REDIST_DIR isn't set. r=khuey.

---
 browser/installer/Makefile.in         |  4 ++++
 browser/installer/package-manifest.in |  2 ++
 browser/installer/removed-files.in    | 20 +++++++++++++-------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index 4cd058d2879a..bc2a6ca20adb 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -91,6 +91,10 @@ DEFINES += -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL)
 DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
 endif
 
+ifdef WIN32_REDIST_DIR
+DEFINES += -DMOZ_WIN32_REDIST=1
+endif
+
 include $(topsrcdir)/ipc/app/defs.mk
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index d21ca54f2d78..77dd8861fdee 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -69,6 +69,7 @@
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
 #ifdef XP_WIN32
+#ifdef MOZ_WIN32_REDIST
 #ifndef MOZ_DEBUG
 #if _MSC_VER == 1400
 @BINPATH@/Microsoft.VC80.CRT.manifest
@@ -89,6 +90,7 @@
 #endif
 #endif
 #endif
+#endif
 
 [browser]
 ; [Base Browser Files]
diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in
index 9b81d1ffc37c..defc14353ab5 100644
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -1352,29 +1352,35 @@ xpicleanup@BIN_SUFFIX@
   components/jsd3250.dll
   components/nsPostUpdateWin.js
   js3250.dll
-  plugins/npnul32.dll
-  #if _MSC_VER != 1400
+  mozcpp19.dll
+  mozcrt19.dll
+  #ifndef MOZ_WIN32_REDIST
+    #define _MSC_VER_REDIST 0000
+  #else
+    #define _MSC_VER_REDIST _MSC_VER
+  #endif
+  #if _MSC_VER_REDIST != 1400
     Microsoft.VC80.CRT.manifest
     msvcm80.dll
     msvcp80.dll
     msvcr80.dll
   #endif
-  #if _MSC_VER != 1500
+  #if _MSC_VER_REDIST != 1500
     Microsoft.VC90.CRT.manifest
     msvcm90.dll
     msvcp90.dll
     msvcr90.dll
   #endif
-  #if _MSC_VER != 1600
+  #if _MSC_VER_REDIST != 1600
     msvcp100.dll
     msvcr100.dll
   #endif
-  #if _MSC_VER != 1700
+  #if _MSC_VER_REDIST != 1700
     msvcp110.dll
     msvcr110.dll
   #endif
-  mozcrt19.dll
-  mozcpp19.dll
+  #undef _MSC_VER_REDIST
+  plugins/npnul32.dll
 #endif
 @DLL_PREFIX@xpcom_core@DLL_SUFFIX@
 components/@DLL_PREFIX@jar50@DLL_SUFFIX@