Bug 1659746 - Move `MOZ_WINCONSOLE` from `old-configure` to Python `configure` r=nalexander
authorRicky Stewart <rstewart@mozilla.com>
Tue, 18 Aug 2020 16:05:26 +0000
changeset 545135 ad2f6c506a2707aa6bc3a4afedc0a6a18f88eb32
parent 545134 78205b816ac8fe2730d1fb3fa3b109a5befbfe67
child 545136 de9369f536132eb646e399db6f7022517a877d7d
push id124404
push userrstewart@mozilla.com
push dateTue, 18 Aug 2020 16:19:02 +0000
treeherderautoland@ad2f6c506a27 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1659746
milestone81.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1659746 - Move `MOZ_WINCONSOLE` from `old-configure` to Python `configure` r=nalexander Differential Revision: https://phabricator.services.mozilla.com/D87454
old-configure.in
toolkit/moz.configure
--- a/old-configure.in
+++ b/old-configure.in
@@ -102,20 +102,16 @@ else
     esac
     AC_PROG_CXX
     AC_PROG_RANLIB
     MOZ_PATH_PROGS(AS, $AS as, $CC)
     AC_CHECK_PROGS(STRIP, strip, :)
     AC_CHECK_PROGS(OTOOL, otool, :)
 fi
 
-if test -n "$MOZ_WINCONSOLE"; then
-    AC_DEFINE(MOZ_WINCONSOLE)
-fi
-
 MOZ_TOOL_VARIABLES
 
 dnl ========================================================
 dnl Special win32 checks
 dnl ========================================================
 
 WINVER=601
 
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -2085,8 +2085,15 @@ option(env='ANDROID_PACKAGE_NAME', nargs
 def android_package_name(value, moz_app_name):
     if value:
         return value[0]
     if moz_app_name == 'fennec':
         return 'org.mozilla.fennec_aurora'
     return 'org.mozilla.%s' % moz_app_name
 
 set_config('ANDROID_PACKAGE_NAME', android_package_name)
+
+
+# Miscellaneous options
+# ==============================================================
+option(env='MOZ_WINCONSOLE', nargs='?',
+       help='Whether we can create a console window.')
+set_define('MOZ_WINCONSOLE', True, when=depends('MOZ_WINCONSOLE')(lambda x: x))