From e07a78dad07bfe1f242b63305120f3d107037562 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Fri, 22 Apr 2011 19:33:36 +0200
Subject: [PATCH] Bug 650699 - Sort out MSVC DLLs packaging in Debug builds;
 (Av1) In debug builds, don't warn nor package. r=ted.mielczarek.

---
 build/win32/Makefile.in | 2 ++
 configure.in            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in
index a52de81469f4..07a837b17f49 100644
--- a/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@@ -64,6 +64,7 @@ include $(topsrcdir)/config/rules.mk
 
 ifndef MOZ_MEMORY
 ifdef WIN32_REDIST_DIR
+ifndef MOZ_DEBUG
 
 ifeq (1400,$(_MSC_VER))
 REDIST_FILES = \
@@ -96,5 +97,6 @@ libs::
 	install --preserve-timestamps $(foreach f,$(REDIST_FILES),"$(WIN32_REDIST_DIR)"/$(f)) $(FINAL_TARGET)
 endif
 
+endif # ! MOZ_DEBUG
 endif # WIN32_REDIST_DIR
 endif # ! MOZ_MEMORY
diff --git a/configure.in b/configure.in
index 56ca63dcaa3d..b617a522992a 100644
--- a/configure.in
+++ b/configure.in
@@ -7256,7 +7256,7 @@ fi
 if test -z "$MOZ_MEMORY"; then
   case "${target}" in
     *-mingw*)
-      if test -z "$WIN32_REDIST_DIR"; then
+      if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then
         AC_MSG_WARN([When not building jemalloc, you need to set WIN32_REDIST_DIR to the path to the Visual C++ Redist (usually VCINSTALLDIR\redist\x86\Microsoft.VC80.CRT, for VC++ v8) if you intend to distribute your build.])
       fi
       ;;