configure.ac | 27 +--------------------------
1 file changed, 1 insertion(+), 26 deletions(-)
New commits:
commit 70dd00f23ee53ea5ae7f3c292906335fb6000ab4
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Nov 25 08:45:41 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Nov 25 14:46:03 2021 +0100
required curl_multi_wakeup is only in >= curl 7.68.0
Change-Id: I53878de49549098ff90ef1f68f88880a6eb5bf55
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125797
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 9a5df92f922f..b573c6934310 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10287,32 +10287,7 @@ if test "$enable_curl" = "yes" -a "$with_system_curl"
= "yes"; then
AC_MSG_RESULT([external])
SYSTEM_CURL=TRUE
- # First try PKGCONFIG and then fall back
- PKG_CHECK_MODULES(CURL, libcurl >= 7.63.0,, [:])
-
- if test -n "$CURL_PKG_ERRORS"; then
- AC_PATH_PROG(CURLCONFIG, curl-config)
- if test -z "$CURLCONFIG"; then
- AC_MSG_ERROR([curl development files not found])
- fi
- CURL_LIBS=`$CURLCONFIG --libs`
- FilterLibs "${CURL_LIBS}"
- CURL_LIBS="${filteredlibs}"
- CURL_CFLAGS=$("$CURLCONFIG" --cflags | sed -e "s/-I/${ISYSTEM?}/g")
- curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'`
-
- AC_MSG_CHECKING([whether libcurl is >= 7.19.4])
- case $curl_version in
- dnl brackets doubled below because Autoconf uses them as m4 quote
characters,
- dnl so they need to be doubled to end up in the configure script
- 7.19.4|7.19.[[5-9]]|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
- AC_MSG_RESULT([yes])
- ;;
- *)
- AC_MSG_ERROR([no, you have $curl_version])
- ;;
- esac
- fi
+ PKG_CHECK_MODULES(CURL, libcurl >= 7.68.0)
ENABLE_CURL=TRUE
elif test "$enable_curl" = "no"; then
