romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-02 12:10:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

build: drop exclamation marks, use "msh3/msquic" where incomplete

Browse source 
Closes #15002
This commit is contained in:
Viktor Szakats 2024-09-22 15:21:02 +02:00
parent 1124170475
commit 668584a94f
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -880,7 +880,7 @@ endif()
option(USE_QUICHE "Use quiche library for HTTP/3 support" OFF)
if(USE_QUICHE)
if(USE_NGTCP2)
message(FATAL_ERROR "Only one HTTP/3 backend can be selected!")
message(FATAL_ERROR "Only one HTTP/3 backend can be selected")
endif()
find_package(Quiche REQUIRED)
if(NOT HAVE_BORINGSSL)
@ -899,10 +899,10 @@ if(USE_QUICHE)
endif()
endif()
option(USE_MSH3 "Use msquic library for HTTP/3 support" OFF)
option(USE_MSH3 "Use msh3/msquic library for HTTP/3 support" OFF)
if(USE_MSH3)
if(USE_NGTCP2 OR USE_QUICHE)
message(FATAL_ERROR "Only one HTTP/3 backend can be selected!")
message(FATAL_ERROR "Only one HTTP/3 backend can be selected")
endif()
find_package(MSH3 REQUIRED)
include_directories(SYSTEM ${MSH3_INCLUDE_DIRS})
@ -912,7 +912,7 @@ endif()
if(USE_OPENSSL_QUIC)
if(USE_NGTCP2 OR USE_QUICHE OR USE_MSH3)
message(FATAL_ERROR "Only one HTTP/3 backend can be selected!")
message(FATAL_ERROR "Only one HTTP/3 backend can be selected")
endif()
find_package(OpenSSL 3.3.0 REQUIRED)

4
configure.ac
View file

@ -3573,7 +3573,7 @@ AC_INCLUDES_DEFAULT
fi
dnl **********************************************************************
dnl Check for msh3 (QUIC)
dnl Check for msh3/msquic (QUIC)
dnl **********************************************************************
OPT_MSH3="no"
@ -3612,7 +3612,7 @@ if test X"$want_msh3" != Xno; then
AC_MSG_ERROR([the detected TLS library does not support QUIC, making --with-msh3 a no-no])
fi
if test "$OPENSSL_ENABLED" != "1"; then
AC_MSG_ERROR([msh3 requires OpenSSL])
AC_MSG_ERROR([msh3/msquic requires OpenSSL])
fi
fi