summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2021-10-28 12:18:59 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2021-10-28 15:43:48 +0200
commit6bbf36ff2dd0d213d5e8a374ff4138767c8d41de (patch)
tree30cfe8c65f9d62dd2815ebdc0690d859abfc39fa
parent4f53fc260438591467c2b9dfc13eb76abeac3d9e (diff)
Don't auto-enable --enable-online-update for Win/Mac
newcomers will run into the need to specify --with-privacy-policy-url and besides that the update server won't know about the build done/will be useless without also using your own update-check server. Change-Id: I77ff61e55ae4a0ca387b79cc2dcfc3f3059ef962 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124324 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--configure.ac9
1 files changed, 2 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index a810ba0b88af..f0cca1285c76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1769,7 +1769,7 @@ AC_ARG_ENABLE(ccache,
libo_FUZZ_ARG_ENABLE(online-update,
AS_HELP_STRING([--enable-online-update],
[Enable the online update service that will check for new versions of
- LibreOffice. By default, it is enabled on Windows and Mac, disabled on Linux.
+ LibreOffice. Disabled by default. Requires --with-privacy-policy-url to be set.
If the value is "mar", the experimental Mozilla-like update will be
enabled instead of the traditional update mechanism.]),
,)
@@ -13228,12 +13228,7 @@ ENABLE_ONLINE_UPDATE=
ENABLE_ONLINE_UPDATE_MAR=
UPDATE_CONFIG=
if test "$enable_online_update" = ""; then
- if test "$_os" = "WINNT" -o "$_os" = "Darwin"; then
- AC_MSG_RESULT([yes])
- ENABLE_ONLINE_UPDATE="TRUE"
- else
- AC_MSG_RESULT([no])
- fi
+ AC_MSG_RESULT([no])
else
if test "$enable_online_update" = "mar"; then
AC_MSG_RESULT([yes - MAR-based online update])