From 0442dd4ee579d4cc1b9d8fb3ef3bc66fe6df4148 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 22 Aug 2020 09:49:44 -0400 Subject: [PATCH] [Pale-Moon] Add a configure option for Phoenix Extensions Dual-GUID System and set default off in confvars --- application/palemoon/configure.in | 17 +++++++++++++++-- application/palemoon/confvars.sh | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/application/palemoon/configure.in b/application/palemoon/configure.in index 70ddf66210..0ccc5dc16a 100644 --- a/application/palemoon/configure.in +++ b/application/palemoon/configure.in @@ -7,13 +7,26 @@ 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_PHOENIX) AC_SUBST(MOZ_PHOENIX) + AC_DEFINE(MC_PALEMOON) AC_SUBST(MC_PALEMOON) -AC_DEFINE(MOZ_PHOENIX_EXTENSIONS) -AC_SUBST(MOZ_PHOENIX_EXTENSIONS) dnl Optional parts of the build. +dnl ======================================================== +dnl = Enable Phoenix Extension Support +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(phoenix-extensions, +[ --enable-phoenix-extensions Enable Phoenix Extension Support], + MOZ_PHOENIX_EXTENSIONS=1, + MOZ_PHOENIX_EXTENSIONS=) + +if test -n "$MOZ_PHOENIX_EXTENSIONS"; then + AC_DEFINE(MOZ_PHOENIX_EXTENSIONS) +fi + +AC_SUBST(MOZ_PHOENIX_EXTENSIONS) + dnl ======================================================== dnl = Disable Sync dnl ======================================================== diff --git a/application/palemoon/confvars.sh b/application/palemoon/confvars.sh index 755f24f219..2c55912de0 100644 --- a/application/palemoon/confvars.sh +++ b/application/palemoon/confvars.sh @@ -65,7 +65,7 @@ MOZ_DEVTOOLS=1 # Allows installation of Firefox GUID targeted extensions despite having # a different Application ID # On UXP this is a possible feature only for the Tycho Add-ons Manager -MOZ_PHOENIX_EXTENSIONS=1 +MOZ_PHOENIX_EXTENSIONS= # Platform Feature: Sync Service MOZ_SERVICES_COMMON=1