summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2020-11-03 22:00:08 +0200
committerTor Lillqvist <tml@collabora.com>2020-11-15 10:45:35 +0100
commit2dabeb639488189f096cf0819b591c1d2a0f3497 (patch)
tree065304c4dfe77446cf3a33c69d7701c79acce2aa /configure.ac
parent2436a368460c26bc2b47742966ed152c46eedba8 (diff)
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 <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105886 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 39605d0b0020..15b72d3865a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9976,7 +9976,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"