[Libreoffice-commits] online.git: configure.ac loolwsd.xml.in

[Jan Holesovsky (via logerrit)]

 configure.ac   |   10 ++++++++++
 loolwsd.xml.in |    2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 0ec796dbee3516800d4600e5b64afe06942e9e2f
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Apr 15 16:17:31 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Apr 16 11:36:00 2020 +0200

    Welcome: Add ./configure of the welcome message default.
    
    Change-Id: I090c7d657d2b0a696117f64f25c11ffb249fb272
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92277
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/configure.ac b/configure.ac
index c605c87a4..c29f10e08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,6 +258,11 @@ AC_ARG_WITH([max-documents],
              AS_HELP_STRING([--with-max-documents],
                            [Set the limit on the total number of documents. Def: 10, Min: 2.]))
 
+AC_ARG_ENABLE(welcome-message,
+    AS_HELP_STRING([--enable-welcome-message],
+        [Enables welcome message on version update. Can be changed later in loolwsd.xml.])
+)
+
 AC_ARG_WITH([sanitizer],
              AS_HELP_STRING([--with-sanitizer],
                            [Enable one or more compatible sanitizers. E.g. --with-sanitizer=address,undefined,leak]))
@@ -593,6 +598,11 @@ AS_IF([test "$MAX_DOCUMENTS" -lt "2"],
 AC_DEFINE_UNQUOTED([MAX_DOCUMENTS],[$MAX_DOCUMENTS],[Limit the maximum number of open documents])
 AC_SUBST(MAX_DOCUMENTS)
 
+ENABLE_WELCOME_MESSAGE=false
+AS_IF([test "$enable_welcome_message" = "yes"],
+      [ENABLE_WELCOME_MESSAGE="true"])
+AC_SUBST(ENABLE_WELCOME_MESSAGE)
+
 VEREIGN_URL=
 if test "$enable_vereign" = "yes"; then
     VEREIGN_URL="https://app.vereign.com"
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 1739a661f..d22ec7e98 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -115,7 +115,7 @@
     </watermark>
 
     <welcome>
-      <enable type="bool" desc="Controls whether the welcome screen should be shown to the users on new install and updates." default="true">true</enable>
+      <enable type="bool" desc="Controls whether the welcome screen should be shown to the users on new install and updates." default="@ENABLE_WELCOME_MESSAGE@">@ENABLE_WELCOME_MESSAGE@</enable>
       <path desc="Path to 'welcome-$lang.html' files served on first start or when the version changes. When empty, defaults to the Release notes." type="path" relative="true" default="loleaflet/welcome"></path>
     </welcome>