diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-09-14 11:03:48 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-09-14 12:55:33 +0200 |
| commit | 5bf7c2fa57946cc3323a1d4ee1b2f31d805ae06f (patch) | |
| tree | 5bcc1d64fdb6ab4b41cc3ad50feaec73c25e77ab /configure.ac | |
| parent | 1d4cd39262fb71f72311e33ac2bdb7d925be5d98 (diff) | |
Fix --disable-curl build
Change-Id: I3020d41eb6d0988cc886495a88a073a23bc8161c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156910
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index be1c11e45d38..899724df2547 100644 --- a/configure.ac +++ b/configure.ac @@ -10803,6 +10803,13 @@ AC_SUBST(ICU_MAJOR) AC_SUBST(ICU_MINOR) dnl ================================================================== +dnl CURL +dnl ================================================================== +if test "$enable_curl" == "yes"; then + AC_DEFINE([HAVE_FEATURE_CURL]) +fi + +dnl ================================================================== dnl Breakpad dnl ================================================================== DEFAULT_CRASHDUMP_VALUE="true" @@ -10810,6 +10817,9 @@ AC_MSG_CHECKING([whether to enable breakpad]) if test "$enable_breakpad" != yes; then AC_MSG_RESULT([no]) else + if test "$enable_curl" != "yes"; then + AC_MSG_ERROR([--disable-breakpad must be used when --disable-curl is used]) + fi AC_MSG_RESULT([yes]) ENABLE_BREAKPAD="TRUE" AC_DEFINE(ENABLE_BREAKPAD) @@ -10838,6 +10848,15 @@ fi AC_SUBST(ENABLE_BREAKPAD) AC_SUBST(DEFAULT_CRASHDUMP_VALUE) +dnl ================================================================== +dnl libcmis +dnl ================================================================== +if test "$enable_libcmis" == "yes"; then + if test "$enable_curl" != "yes"; then + AC_MSG_ERROR([--disable-libcmis must be used when --disable-curl is used]) + fi +fi + dnl =================================================================== dnl Orcus dnl =================================================================== @@ -11000,7 +11019,7 @@ no) AC_MSG_RESULT([yes]) # curl is already mandatory (almost) and checked elsewhere if test "$enable_curl" = "no"; then - AC_MSG_ERROR(["--with-webdav conflicts with --disable-curl"]) + AC_MSG_ERROR(["--without-webdav must be used when --disable-curl is used"]) fi WITH_WEBDAV=TRUE ;; |