Bug 1501093 - Permit overriding enable-calendar in SeaMonkey via mozconfig. r=rjl
authorBill Gianopoulos <wgianopoulos@gmail.com>
Sat, 20 Oct 2018 12:30:27 -0400
changeset 33548 3f7e3c78bdd8f998dbbcb0a8d5f366d3623f6364
parent 33547 6876e8c9ea75ac91a2408ba42a644447c8888bef
child 33549 73ea8939f5e07e17edab0670f4b15f3d60037312
push id388
push userclokep@gmail.com
push dateMon, 28 Jan 2019 20:54:56 +0000
reviewersrjl
bugs1501093
Bug 1501093 - Permit overriding enable-calendar in SeaMonkey via mozconfig. r=rjl
mailnews/moz.configure
suite/moz.configure
--- a/mailnews/moz.configure
+++ b/mailnews/moz.configure
@@ -3,17 +3,21 @@
 # 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/.
 
 
 # =========================================================
 # = Lightning extension
 # =========================================================
-option('--enable-calendar',
+@depends(application)
+def calendar_default(app):
+    return app[0].endswith('/suite')
+
+option('--enable-calendar', default=calendar_default,
        help='Enable building of the Lightning calendar extension')
 
 
 @depends_if('--enable-calendar')
 def calendar(arg):
     return True
 
 
--- a/suite/moz.configure
+++ b/suite/moz.configure
@@ -8,18 +8,16 @@ set_config('MOZ_SUITE', True)
 set_define('MOZ_SUITE', True)
 
 set_define('MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES', True)
 
 imply_option('MOZ_PLACES', True)
 imply_option('MOZ_SERVICES_SYNC', False)
 imply_option('MOZ_ALLOW_LEGACY_EXTENSIONS', True)
 
-imply_option('--enable-calendar', True)
-
 
 @depends(application)
 def is_comm(app):
     return app[0].startswith('comm/')
 
 
 @depends(is_comm)
 def toolkit_configure(is_comm):