configure.ac | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
New commits:
commit 9c2fd9ded993c4cae9c01da9d7060c9a4385cfba
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Oct 8 14:46:19 2019 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Oct 8 16:40:33 2019 +0200
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 <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/configure.ac b/configure.ac
index dd71eda5e..fb54564c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
