configure.ac | 33 ++++++++++++++-------------------
1 file changed, 14 insertions(+), 19 deletions(-)
New commits:
commit 2177f48b16b8cd68c0ef4ec817ca391f28324418
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jan 5 17:54:52 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jan 5 21:34:14 2022 +0100
Simplify --with-webdav
...to just be yes/no, now that curl is the only remaining implementation
option. (A drawback of the existing code was that it silently treated
--with-webdav or --with-webav=neon etc. the same as --without-webdav.)
Change-Id: If1478ac3bf5c49d0754d6ab89c8c04c7c51c9ad2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128020
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/configure.ac b/configure.ac
index e414c2d7f15f..9ef7dbe9c7b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2420,10 +2420,8 @@ AC_ARG_WITH(system-lockfile,
[Detect a system lockfile program or use the \$file argument.]))
AC_ARG_WITH(webdav,
- AS_HELP_STRING([--with-webdav],
- [Specify which library to use for webdav implementation.
- Possible values: "curl", "no". The default value is "curl".
- Example: --with-webdav="curl"]))
+ AS_HELP_STRING([--without-webdav],
+ [Disable WebDAV support in the UCB.]))
AC_ARG_WITH(linker-hash-style,
AS_HELP_STRING([--with-linker-hash-style],
@@ -10812,26 +10810,23 @@ AC_SUBST(XRANDR_CFLAGS)
AC_SUBST(XRANDR_LIBS)
AC_SUBST(ENABLE_RANDR)
-if test "$test_webdav" = yes; then
- if test -z "$with_webdav"; then
- WITH_WEBDAV=curl
- else
- WITH_WEBDAV="$with_webdav"
- fi
+if test -z "$with_webdav"; then
+ with_webdav=$test_webdav
fi
-AC_MSG_CHECKING([for webdav library])
-case "$WITH_WEBDAV" in
-curl)
- AC_MSG_RESULT([curl])
+AC_MSG_CHECKING([for WebDAV support])
+case "$with_webdav" in
+no)
+ AC_MSG_RESULT([no])
+ WITH_WEBDAV=""
+ ;;
+*)
+ AC_MSG_RESULT([yes])
# curl is already mandatory (almost) and checked elsewhere
if test "$enable_curl" = "no"; then
- AC_MSG_ERROR(["--with-webdav=curl conflicts with --disable-curl"])
+ AC_MSG_ERROR(["--with-webdav conflicts with --disable-curl"])
fi
- ;;
-*)
- AC_MSG_RESULT([none, disabled])
- WITH_WEBDAV=""
+ WITH_WEBDAV=TRUE
;;
esac
AC_SUBST(WITH_WEBDAV)
