From a4225a298a75e88112d8c89a474fd9a15d4d8057 Mon Sep 17 00:00:00 2001
From: Tim Abraldes <tabraldes@mozilla.com>
Date: Tue, 24 Jul 2012 10:04:04 -0700
Subject: [PATCH] bug 773865. Setting env var `MOZ_WINCONSOLE` now causes
 `MOZ_WINCONSOLE` to be defined for the preprocessor as well. windbgdlg no
 longer fails to build when `MOZ_WINCONSOLE` env var has been set to 1. r=ted

---
 configure.in                | 4 ++++
 xpcom/windbgdlg/Makefile.in | 1 +
 xulrunner/app/Makefile.in   | 1 -
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 79d3d752a8ca..6da07c853550 100644
--- a/configure.in
+++ b/configure.in
@@ -363,6 +363,10 @@ else
     fi
 fi
 
+if test -n "$MOZ_WINCONSOLE"; then
+    AC_DEFINE(MOZ_WINCONSOLE)
+fi
+
 MOZ_TOOL_VARIABLES
 
 dnl ========================================================
diff --git a/xpcom/windbgdlg/Makefile.in b/xpcom/windbgdlg/Makefile.in
index 942d6760cdff..c48d717db831 100644
--- a/xpcom/windbgdlg/Makefile.in
+++ b/xpcom/windbgdlg/Makefile.in
@@ -14,5 +14,6 @@ SIMPLE_PROGRAMS	= windbgdlg$(BIN_SUFFIX)
 
 CPPSRCS		= windbgdlg.cpp
 
+MOZ_WINCONSOLE = 0
 include $(topsrcdir)/config/rules.mk
 
diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in
index 35225d659341..de4b5a8396dd 100644
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@@ -57,7 +57,6 @@ else
 MOZ_WINCONSOLE = 0
 endif
 endif
-DEFINES += -DMOZ_WINCONSOLE=$(MOZ_WINCONSOLE)
 
 # This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
 # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.