Don't build internal updater by default and set default update channel to an inactive one.

This commit is contained in:
wolfbeast 2018-11-11 18:13:40 +01:00 committed by Roy Tam
commit 1268dd6fe5
3 changed files with 10 additions and 10 deletions

View file

@ -8,7 +8,7 @@ MOZ_APP_VENDOR=Moonchild
MOZ_PHOENIX=1
MOZ_AUSTRALIS=1
MC_BASILISK=1
MOZ_UPDATER=1
MOZ_UPDATER=
if test "$OS_ARCH" = "WINNT" -o \
"$OS_ARCH" = "Linux"; then
@ -45,9 +45,9 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
# This should usually be the same as the value MAR_CHANNEL_ID.
# If more than one ID is needed, then you should use a comma separated list
# of values.
ACCEPTED_MAR_CHANNEL_IDS=basilisk-release
ACCEPTED_MAR_CHANNEL_IDS=unofficial,unstable,release
# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
MAR_CHANNEL_ID=basilisk-release
MAR_CHANNEL_ID=unofficial
# Features
MOZ_PROFILE_MIGRATOR=1

View file

@ -53,9 +53,9 @@ MOZ_PROFILE_MIGRATOR=
# MAR_CHANNEL_ID must not contained the follow 3 characters: ",\t"
# ACCEPTED_MAR_CHANNEL_IDS should usually be the same as MAR_CHANNEL_ID
# If more than one ID is needed, then you should use a comma seperated list.
MOZ_UPDATER=1
MAR_CHANNEL_ID=palemoon-release
ACCEPTED_MAR_CHANNEL_IDS=palemoon-release
MOZ_UPDATER=
MAR_CHANNEL_ID=unofficial
ACCEPTED_MAR_CHANNEL_IDS=unofficial,unstable,release
# Platform Feature: Developer Tools
# XXX: Devtools are disabled until they can be made to work with Pale Moon

View file

@ -3778,10 +3778,10 @@ if test "$MOZ_IOS"; then
MOZ_UPDATER=
fi
MOZ_ARG_DISABLE_BOOL(updater,
[ --disable-updater Disable building of updater],
MOZ_UPDATER=,
MOZ_UPDATER=1 )
MOZ_ARG_ENABLE_BOOL(updater,
[ --enable-updater Enable building of internal updater],
MOZ_UPDATER=1,
MOZ_UPDATER= )
if test -n "$MOZ_UPDATER"; then
AC_DEFINE(MOZ_UPDATER)