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

The --with-lo-path is not necessary when building for iOS or Android 

Change-Id: Ib245058f1a3e985547e9a44dd4c8ebc613875cb6
Reviewed-on: https://gerrit.libreoffice.org/80444
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
feature/calczoom
Tor Lillqvist 2019-10-08 14:46:19 +03:00
parent 40d2e7ab48
commit 9c2fd9ded9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -506,15 +506,17 @@ AS_IF([test -n "$LOKIT_PATH"],
[CPPFLAGS="$CPPFLAGS -I${LOKIT_PATH}"])
lokit_msg="$LOKIT_PATH"
AC_MSG_CHECKING([for LibreOffice path])
if test -n "$with_lo_path"; then
# strip trailing '/' from LO_PATH, 'ln -s' with such path will otherwise fail
LO_PATH="${with_lo_path%/}"
AC_MSG_RESULT([found])
else
AC_MSG_RESULT([not found])
AC_MSG_ERROR([LibreOffice path must be configured: --with-lo-path])
fi
AS_IF([test "$ENABLE_IOSAPP" != "true" -a "$ENABLE_ANDROIDAPP" != "true"],
[AC_MSG_CHECKING([for LibreOffice path])
if test -n "$with_lo_path"; then
# strip trailing '/' from LO_PATH, 'ln -s' with such path will otherwise fail
LO_PATH="${with_lo_path%/}"
AC_MSG_RESULT([found])
else
AC_MSG_RESULT([not found])
AC_MSG_ERROR([LibreOffice path must be configured: --with-lo-path])
fi
])
JAIL_PATH=not-set
SYSTEMPLATE_PATH=not-set