diff --git a/old-configure.in b/old-configure.in
index 3227eb2db99a..696b31c10dff 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -107,10 +107,6 @@ else
     AC_CHECK_PROGS(OTOOL, otool, :)
 fi
 
-if test -n "$MOZ_WINCONSOLE"; then
-    AC_DEFINE(MOZ_WINCONSOLE)
-fi
-
 MOZ_TOOL_VARIABLES
 
 dnl ========================================================
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 79baae699c24..2c4d8fa2445e 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -2090,3 +2090,10 @@ def android_package_name(value, moz_app_name):
     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))