mirror of
https://github.com/curl/curl.git
synced 2026-06-13 19:45:39 +03:00
or newer -> higher
This commit is contained in:
parent
1d5dc6d2f9
commit
7d02e46280
11 changed files with 16 additions and 16 deletions
|
|
@ -256,7 +256,7 @@ set(HAVE_STRINGS_H 1)
|
|||
if(_CURL_OLD_LINUX)
|
||||
set(HAVE_STROPTS_H 1)
|
||||
else()
|
||||
set(HAVE_STROPTS_H 0) # glibc 2.30 or newer. https://sourceware.org/legacy-ml/libc-alpha/2019-08/msg00029.html
|
||||
set(HAVE_STROPTS_H 0) # glibc 2.30 or higher. https://sourceware.org/legacy-ml/libc-alpha/2019-08/msg00029.html
|
||||
endif()
|
||||
set(HAVE_STRUCT_SOCKADDR_STORAGE 1)
|
||||
set(HAVE_STRUCT_TIMEVAL 1)
|
||||
|
|
|
|||
|
|
@ -883,7 +883,7 @@ endif()
|
|||
if(CURL_USE_MBEDTLS)
|
||||
find_package(MbedTLS MODULE REQUIRED)
|
||||
if(MBEDTLS_VERSION VERSION_LESS 3.2.0)
|
||||
message(FATAL_ERROR "mbedTLS v3.2.0 or newer is required.")
|
||||
message(FATAL_ERROR "mbedTLS v3.2.0 or higher is required.")
|
||||
endif()
|
||||
set(_ssl_enabled ON)
|
||||
set(USE_MBEDTLS ON)
|
||||
|
|
@ -917,7 +917,7 @@ if(CURL_USE_WOLFSSL)
|
|||
set(_curl_ca_bundle_supported TRUE)
|
||||
|
||||
if(USE_OPENSSL AND WOLFSSL_VERSION VERSION_LESS 5.7.6)
|
||||
message(FATAL_ERROR "wolfSSL 5.7.6 or newer is required to coexist with OpenSSL.")
|
||||
message(FATAL_ERROR "wolfSSL 5.7.6 or higher is required to coexist with OpenSSL.")
|
||||
endif()
|
||||
|
||||
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "WOLFSSL_OPTIONS_IGNORE_SYS")
|
||||
|
|
@ -963,7 +963,7 @@ if(CURL_USE_RUSTLS)
|
|||
endif()
|
||||
endif()
|
||||
if(NOT HAVE_RUSTLS_SUPPORTED_HPKE)
|
||||
message(FATAL_ERROR "rustls-ffi library does not provide rustls_supported_hpke function. Required version is 0.15 or newer.")
|
||||
message(FATAL_ERROR "rustls-ffi library does not provide rustls_supported_hpke function. Required version is 0.15 or higher.")
|
||||
endif()
|
||||
|
||||
if(CURL_DEFAULT_SSL_BACKEND AND CURL_DEFAULT_SSL_BACKEND STREQUAL "rustls")
|
||||
|
|
@ -1002,7 +1002,7 @@ if(ZSTD_FOUND)
|
|||
set(HAVE_ZSTD ON)
|
||||
list(APPEND CURL_LIBS CURL::zstd)
|
||||
else()
|
||||
message(WARNING "zstd v1.0.0 or newer is required, disabling zstd support.")
|
||||
message(WARNING "zstd v1.0.0 or higher is required, disabling zstd support.")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ target_link_libraries(my_target PRIVATE CURL::libcurl)
|
|||
- `IMPORT_LIB_SUFFIX`: Import library suffix. Default: `_imp` for MSVC-like toolchains, otherwise empty.
|
||||
- `LIBCURL_OUTPUT_NAME`: Basename of the curl library. Default: `libcurl`
|
||||
- `PICKY_COMPILER`: Enable picky compiler options. Default: `ON`
|
||||
- `SHARE_LIB_OBJECT`: Build shared and static libcurl in a single pass (requires CMake 3.12 or newer). Default: `ON` for Windows
|
||||
- `SHARE_LIB_OBJECT`: Build shared and static libcurl in a single pass (requires CMake 3.12 or higher). Default: `ON` for Windows
|
||||
- `STATIC_LIB_SUFFIX`: Static library suffix. Default: (empty)
|
||||
|
||||
## Root CA options
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ Once downloaded, build `curl` using `--with-rustls` and the path to the extracte
|
|||
Building `rustls-ffi` from source requires both a rust compiler, and the [cargo-c] cargo plugin.
|
||||
|
||||
To install a Rust compiler, use [rustup] or your package manager to install
|
||||
the **1.73** or newer toolchain.
|
||||
the **1.73** or higher toolchain.
|
||||
|
||||
To install `cargo-c`, use your [package manager][cargo-c pkg], download
|
||||
[a pre-built archive][cargo-c prebuilt], or build it from source with `cargo install cargo-c`.
|
||||
|
|
|
|||
|
|
@ -61,12 +61,12 @@
|
|||
#include <ares.h>
|
||||
|
||||
#if ARES_VERSION < 0x011000
|
||||
#error "requires c-ares 1.16.0 or newer"
|
||||
#error "requires c-ares 1.16.0 or higher"
|
||||
#endif
|
||||
|
||||
#ifdef USE_HTTPSRR
|
||||
#if ARES_VERSION < 0x011c00
|
||||
#error "requires c-ares 1.28.0 or newer for HTTPSRR"
|
||||
#error "requires c-ares 1.28.0 or higher for HTTPSRR"
|
||||
#endif
|
||||
#define HTTPSRR_WORKS
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ timediff_t Curl_async_timeleft_ms(struct Curl_easy *data,
|
|||
#ifdef USE_ARES
|
||||
|
||||
#if ARES_VERSION < 0x011000
|
||||
#error "requires c-ares 1.16.0 or newer"
|
||||
#error "requires c-ares 1.16.0 or higher"
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
#ifdef HAVE_LIBZ
|
||||
|
||||
#if !defined(ZLIB_VERNUM) || (ZLIB_VERNUM < 0x1252)
|
||||
#error "requires zlib 1.2.5.2 or newer"
|
||||
#error "requires zlib 1.2.5.2 or higher"
|
||||
#endif
|
||||
|
||||
typedef enum {
|
||||
|
|
|
|||
|
|
@ -545,7 +545,7 @@ static bool xfer_may_multiplex(const struct Curl_easy *data,
|
|||
|
||||
if(Curl_multiplex_wanted(data->multi) &&
|
||||
(data->state.http_neg.allowed & (CURL_HTTP_V2x | CURL_HTTP_V3x)))
|
||||
/* allows HTTP/2 or newer */
|
||||
/* allows HTTP/2 or higher */
|
||||
return TRUE;
|
||||
}
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
#error "wolfSSL version should be at least 5.0.0"
|
||||
#endif
|
||||
#if defined(OPENSSL_COEXIST) && LIBWOLFSSL_VERSION_HEX < 0x05007006
|
||||
#error "wolfSSL 5.7.6 or newer is required to coexist with OpenSSL"
|
||||
#error "wolfSSL 5.7.6 or higher is required to coexist with OpenSSL"
|
||||
#endif
|
||||
|
||||
/* To determine what functions are available we rely on one or both of:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#***************************************************************************
|
||||
,#***************************************************************************
|
||||
# _ _ ____ _
|
||||
# Project ___| | | | _ \| |
|
||||
# / __| | | | |_) | |
|
||||
|
|
@ -441,7 +441,7 @@ AC_DEFUN([CURL_CHECK_LIB_ARES], [
|
|||
LDFLAGSPC="$clean_LDFLAGSPC $ares_LDFLAGS"
|
||||
LIBS="$ares_LIBS $clean_LIBS"
|
||||
|
||||
dnl check if c-ares new enough, 1.16.0 or newer
|
||||
dnl check if c-ares new enough, 1.16.0 or higher
|
||||
AC_CHECK_FUNC([ares_getaddrinfo],
|
||||
[
|
||||
],[
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ dnl This macro embeds automake machinery into configure
|
|||
dnl script regardless of automake version used in order
|
||||
dnl to generate configure script.
|
||||
dnl
|
||||
dnl When using automake version 1.14 or newer, automake
|
||||
dnl When using automake version 1.14 or higher, automake
|
||||
dnl initialization option 'subdir-objects' is used to
|
||||
dnl generate the configure script, otherwise this option
|
||||
dnl is not used.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue