[Libreoffice-commits] online.git: configure.ac

[Jan-Marek Glogowski (via logerrit)]

 configure.ac |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit c45d8197a6fbaee4aa7de19d336916a451e74b6c
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sat Jul 11 02:57:25 2020 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat Jul 11 11:59:14 2020 +0200

    Report better SSL state for mobile apps
    
    I tried to enable SSL, because I didn't want to be insecure, as
    stated by the message "insecure: ssl disabled". But for mobile
    apps the whole communication is actually local and SSL no any
    support option, so this is hopefully a better message.
    
    Change-Id: I35c50772ed49910997b80e6f449483da21775120
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98552
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/configure.ac b/configure.ac
index 7d2f0a4f0..c678540db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -915,7 +915,7 @@ mobile_app=
 ENABLE_MOBILEAPP=
 MOBILEAPP=0
 AC_MSG_CHECKING([Is this a mobile app])
-if test "$enable_gtkapp" = "yes" -o "$enable_iosapp" = "yes" -o "$enable_androidapp"; then
+if test "$enable_gtkapp" = "yes" -o "$enable_iosapp" = "yes" -o "$enable_androidapp" = "yes"; then
      AC_MSG_RESULT([Yes])
      mobile_app=true;
      MOBILEAPP=1
@@ -933,7 +933,11 @@ if test "$enable_ssl" != "no" -a "$mobile_app" != "true"; then
    ENABLE_SSL=true
    AC_DEFINE([ENABLE_SSL],1,[Whether to enable SSL])
 else
-   ssl_msg="insecure: ssl disabled"
+   if test "$mobile_app" != "true"; then
+     ssl_msg="insecure: ssl disabled"
+   else
+     ssl_msg="invalid for mobile apps (disabled)"
+   fi
    ENABLE_SSL=false
    AC_DEFINE([ENABLE_SSL],0,[Whether to enable SSL])
 fi