Bug 1628424 - Build/Include the OpenPGP code by default in comm-central. r=kaie,r=rjl
authorKai Engert <kaie@kuix.de>
Wed, 22 Apr 2020 19:04:05 +0200
changeset 38025 f0676c4790a181e102e26c54b13a526d33e0e63c
parent 38024 67ee43e49968f2ccfc9a701dc93d77b2db8858e9
child 38026 ddf247cdde7895f9951db69fbe42af78c58c7bcd
push id2595
push userclokep@gmail.com
push dateMon, 04 May 2020 19:02:04 +0000
treeherdercomm-beta@f53913797371 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskaie, rjl
bugs1628424
Bug 1628424 - Build/Include the OpenPGP code by default in comm-central. r=kaie,r=rjl
mail/moz.configure
mailnews/moz.configure
--- a/mail/moz.configure
+++ b/mail/moz.configure
@@ -99,12 +99,10 @@ set_config('TB_LIBOTR_PREBUILT', pkg_lib
 set_config('MOZ_TELEMETRY_EXTRA_HISTOGRAM_FILES', ['/comm/mail/components/telemetry/Histograms.json'])
 set_config('MOZ_TELEMETRY_EXTRA_SCALAR_FILES', ['/comm/mail/components/telemetry/Scalars.yaml'])
 set_config('MOZ_TELEMETRY_EXTRA_EVENT_FILES', ['/comm/mail/components/telemetry/Events.yaml'])
 
 include('../build/moz.configure/gecko_source.configure')
 
 include('../mailnews/moz.configure')
 
-include('../third_party/openpgp.configure', when='--enable-openpgp')
-
 imply_option('--enable-app-system-headers', True)
 include('../../toolkit/moz.configure')
--- a/mailnews/moz.configure
+++ b/mailnews/moz.configure
@@ -36,28 +36,29 @@ def mapi_support(arg):
 
 set_config('MOZ_MAPI_SUPPORT', mapi_support)
 set_define('MOZ_MAPI_SUPPORT', mapi_support)
 
 # =========================================================
 # = Experimental OpenPGP integration
 # =========================================================
 
-option('--enable-openpgp', default=False,
+option('--enable-openpgp', default=True,
        help='Enable building of the Experimental OpenPGP integration')
 
 
 @depends_if('--enable-openpgp')
 def openpgp(arg):
     return True
 
 
 set_config('MOZ_OPENPGP', openpgp)
 set_define('MOZ_OPENPGP', openpgp)
 
+include('../third_party/openpgp.configure', when='--enable-openpgp')
 
 set_config('MOZ_MOVEMAIL', target_is_unix)
 set_define('HAVE_MOVEMAIL', target_is_unix)
 
 
 option('--enable-calendar', default=False,
        help='Deprecated. Please remove it from your mozconfig.')