summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2020-11-03 22:00:08 +0200
committerCaolán McNamara <caolanm@redhat.com>2020-11-24 10:10:00 +0100
commit8a6f8333ebc1daba068ca474140c03342c861150 (patch)
tree5d2ee8f0f65b74218b13d4bc7852dfb2cd08f604
parent8d248341f219ea65fcf548aeb303a0f177848dd4 (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/+/106468 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--configure.ac4
1 files changed, 3 insertions, 1 deletions
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"