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
authorTim Abraldes <tabraldes@mozilla.com>
Tue, 24 Jul 2012 10:04:04 -0700
changeset 105778 95992c6312e341357d94cb4638decb0a3d53fb3f
parent 105777 f72108b85036e6772e1fb58817aea0141c6bae3e
child 105779 7bf11bf3d11f7ec49560e8bf745359a632055501
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 17:57:20 +0000
reviewersted
bugs773865
milestone17.0a1
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
xpcom/windbgdlg/Makefile.in
xulrunner/app/Makefile.in
--- a/configure.in
+++ b/configure.in
@@ -358,16 +358,20 @@ else
     if test -z "$HOST_AR"; then
         HOST_AR="$AR"
     fi
     if test -z "$HOST_AR_FLAGS"; then
         HOST_AR_FLAGS="$AR_FLAGS"
     fi
 fi
 
+if test -n "$MOZ_WINCONSOLE"; then
+    AC_DEFINE(MOZ_WINCONSOLE)
+fi
+
 MOZ_TOOL_VARIABLES
 
 dnl ========================================================
 dnl Special win32 checks
 dnl ========================================================
 
 # With win8, sdk target=602, WINVER=602
 MOZ_ARG_ENABLE_BOOL(metro,
--- a/xpcom/windbgdlg/Makefile.in
+++ b/xpcom/windbgdlg/Makefile.in
@@ -9,10 +9,11 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 SIMPLE_PROGRAMS	= windbgdlg$(BIN_SUFFIX)
 
 CPPSRCS		= windbgdlg.cpp
 
+MOZ_WINCONSOLE = 0
 include $(topsrcdir)/config/rules.mk
 
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@@ -52,17 +52,16 @@ LIBS += \
 
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG
 MOZ_WINCONSOLE = 1
 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.
 NSDISTMODE = copy
 
 include $(topsrcdir)/config/config.mk
 
 ifdef _MSC_VER