haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable SSL when configuring for mobile. 

Change-Id: Ia337cde9f183849088d3712dd339f21b7d290fd7
private/kendy/mobile
Michael Meeks 2018-11-01 21:20:15 +00:00
parent f8a0fb4c32
commit 52dace9d29
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -372,22 +372,28 @@ AS_IF([test `uname -s` = Linux],
AS_IF([test "$ENABLE_GTKAPP" = true],
[PKG_CHECK_MODULES([WEBKIT],[webkit2gtk-4.0])])
AS_IF([test "$enable_ssl" != "no"],
[AC_DEFINE([ENABLE_SSL],1,[Whether to enable SSL])],
[AC_DEFINE([ENABLE_SSL],0,[Whether to enable SSL])])
AM_CONDITIONAL([ENABLE_SSL], [test "$enable_ssl" != "no"])
AM_CONDITIONAL([ENABLE_DEBUG], [test "$ENABLE_DEBUG" = "true"])
mobile_app=
AC_MSG_CHECKING([Is this a mobile app])
if test "$enable_gtkapp" != "no" -o "$enable_iosapp" != "no"; then
AC_MSG_RESULT([Yes])
mobile_app=true;
else
AC_MSG_RESULT([No])
fi
ENABLE_SSL=true
if test "$enable_ssl" != "no"; then
if test "$enable_ssl" != "no" -a "$mobile_app" != "true"; then
ssl_msg="ssl enabled"
ENABLE_SSL=true
AC_DEFINE([ENABLE_SSL],1,[Whether to enable SSL])
else
ssl_msg="insecure: ssl disabled"
ENABLE_SSL=false
AC_DEFINE([ENABLE_SSL],0,[Whether to enable SSL])
fi
AM_CONDITIONAL([ENABLE_SSL], [$ENABLE_SSL])
AC_SUBST(ENABLE_SSL)
AC_CHECK_HEADERS([security/pam_appl.h],

2
gtk/README
View File

@ -10,7 +10,7 @@ normal Online.
Run autogen.sh, then configure:
./configure --disable-ssl --enable-gtkapp --with-lo-path=/home/tml/lo/master/instdir --with-lokit-path=/home/tml/lo/master/include
./configure --enable-gtkapp --with-lo-path=/home/tml/lo/master/instdir --with-lokit-path=/home/tml/lo/master/include
Obviously, adjust the path to your LibreOffice build tree as necessary.