Bug 1427505: Move `MOZ_THUNDERBIRD` to `moz.configure`; r=Fallen
authorTom Prince <mozilla@hocat.ca>
Sun, 31 Dec 2017 15:40:15 -0700
changeset 29865 2b82730084427beb0d775a99b1dc8399a77799f4
parent 29864 e60b3d52d364eb91499b7b90f11487fdc261d03c
child 29866 7774e765fe5f83b4d826fee5d1331cb01f3698ae
push id2108
push userclokep@gmail.com
push dateMon, 22 Jan 2018 17:53:55 +0000
treeherdercomm-beta@c44930d8ad9b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs1427505
Bug 1427505: Move `MOZ_THUNDERBIRD` to `moz.configure`; r=Fallen MozReview-Commit-ID: C1ysq5cERAy
mail/configure.in
mail/confvars.sh
mail/moz.configure
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -1,17 +1,15 @@
 dnl -*- Mode: Autoconf; tab-width: 2; indent-tabs-mode: nil; -*-
 dnl vi: set tabstop=2 shiftwidth=2 expandtab:
 dnl This Source Code Form is subject to the terms of the Mozilla Public
 dnl License, v. 2.0. If a copy of the MPL was not distributed with this
 dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 dnl Things we need to carry from confvars.sh
-AC_DEFINE(MOZ_THUNDERBIRD)
-AC_SUBST(MOZ_THUNDERBIRD)
 AC_SUBST(THUNDERBIRD_VERSION)
 AC_SUBST(MOZ_BUNDLED_FONTS)
 
 dnl More things we need to carry from confvars.sh
 AC_SUBST(moztopsrcdir)
 AC_SUBST(commtopsrcdir)
 AC_SUBST(mozreltopsrcdir)
 AC_SUBST(commreltopsrcdir)
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -3,17 +3,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 . ${_topsrcdir}/$MOZ_BUILD_APP/../comm-confvars.sh
 
 MOZ_APP_BASENAME=Thunderbird
 MOZ_APP_NAME=thunderbird
 MOZ_UPDATER=1
-MOZ_THUNDERBIRD=1
 
 if test "$OS_ARCH" = "WINNT" -o \
         "$OS_ARCH" = "Linux"; then
   MOZ_BUNDLED_FONTS=1
 fi
 
 if test "$OS_ARCH" = "WINNT"; then
   MOZ_MAINTENANCE_SERVICE=1
--- a/mail/moz.configure
+++ b/mail/moz.configure
@@ -1,14 +1,17 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+set_config('MOZ_THUNDERBIRD', True)
+set_define('MOZ_THUNDERBIRD', True)
+
 set_define('MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES', True)
 
 imply_option('MOZ_PLACES', True)
 imply_option('MOZ_ALLOW_LEGACY_EXTENSIONS', True)
 
 
 @depends(application)
 def is_comm_topdir(app):