diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-11 18:13:40 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-11 18:13:40 +0100 |
| commit | 9d2d304a60738c4508339f0f876a6a1d36af46c5 (patch) | |
| tree | 051f22007324b426446baee4695f6831ae8a8461 | |
| parent | f9e1e4639c10f53da14b5fbb8b64d8b5d06d0572 (diff) | |
| download | UXP-9d2d304a60738c4508339f0f876a6a1d36af46c5.tar UXP-9d2d304a60738c4508339f0f876a6a1d36af46c5.tar.gz UXP-9d2d304a60738c4508339f0f876a6a1d36af46c5.tar.lz UXP-9d2d304a60738c4508339f0f876a6a1d36af46c5.tar.xz UXP-9d2d304a60738c4508339f0f876a6a1d36af46c5.zip | |
Don't build internal updater by default and set default update channel to an inactive one.
| -rw-r--r-- | application/basilisk/confvars.sh | 6 | ||||
| -rw-r--r-- | application/palemoon/confvars.sh | 6 | ||||
| -rw-r--r-- | old-configure.in | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/application/basilisk/confvars.sh b/application/basilisk/confvars.sh index f28feeaef..62aa1a84f 100644 --- a/application/basilisk/confvars.sh +++ b/application/basilisk/confvars.sh @@ -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 diff --git a/application/palemoon/confvars.sh b/application/palemoon/confvars.sh index 830523778..26b02fc85 100644 --- a/application/palemoon/confvars.sh +++ b/application/palemoon/confvars.sh @@ -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 diff --git a/old-configure.in b/old-configure.in index ee69eb39a..6b88a00af 100644 --- a/old-configure.in +++ b/old-configure.in @@ -3695,10 +3695,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) |