configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 8a6f8333ebc1daba068ca474140c03342c861150
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Nov 3 22:00:08 2020 +0200
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Nov 24 10:10:00 2020 +0100
Make --without-webdav work even with --enable-mpl-subset
Change-Id: I319e0b3aefa721f2503494783af6d73470f592a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105271
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106468
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 4be5cd6f59c8..82f590b9098e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10097,7 +10097,9 @@ AC_SUBST(XRANDR_LIBS)
AC_SUBST(ENABLE_RANDR)
if test "$enable_neon" = "no" -o "$enable_mpl_subset" = "yes"; then
- WITH_WEBDAV="serf"
+ if test -z "$WITH_WEBDAV"; then
+ WITH_WEBDAV="serf"
+ fi
fi
if test $_os = iOS -o $_os = Android; then
WITH_WEBDAV="no"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
