dev-cpp/cpp-httplib: add 0.32.0, drop 0.31.0

Switch back to cmake+make, because meson doesn't yet have good way to
make the library available to users via cmake find_package():
https://github.com/mesonbuild/meson/issues/7632

Closes: https://bugs.gentoo.org/969945
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/46
Merges: https://codeberg.org/gentoo/gentoo/pulls/46
Signed-off-by: Sam James <sam@gentoo.org>

5 files changed, 211 insertions, 103 deletions

diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index 50c446f82d59..85c210f9ddfd 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,4 +1,4 @@
 DIST cpp-httplib-0.26.0.tar.gz 1305573 BLAKE2B 4fcb11a4d3af71fa5b67f2dac7c0f3e0a5cae6ed2bf527686ca05dd03b4a91042dfdcfb068b5dc7dd58fd31a537a44ae6f38df7c5d87a1973e3ff738a51dd946 SHA512 b364500f76e2ecb0fe21b032d831272e3f1dfeea71af74e325f8fc4ce9dcdb3c941b97a5b422bdeafb9facd058597b90f8bfc284fb9afe3c33fefa15dd5a010b
 DIST cpp-httplib-0.27.0.tar.gz 1311061 BLAKE2B b273d9ac6a79d74b47d27b49357f0d9ae61501cecba21b61cd53a74d056b9acdaeba530cdfd02111debaadab15c9076e44727997be32de3947eaf16ecdc846c5 SHA512 884d6be8209d8128af2b11c35d7fc592d8a236a65cdcd9b123a77aa73fbd0dbd03c1cbe17cf4dd92797b06d312c9476d59646b9034d8e559095852b021138acc
 DIST cpp-httplib-0.28.0.tar.gz 1312543 BLAKE2B af3d76280bf7299575e04cafd058f7bc223481d5c0316cc8a5d87850de6243174e138be0625e5939ff1c815003ba45c556d14f04b20a26c67bdca313b75e133c SHA512 e7a8877d489c97669a8ee536e1498575be921e558ed947253013fe6b67a49d4569eedd01f543caa70183b92d8ac0e8687d662a70d880954412e387317008a239
-DIST cpp-httplib-0.31.0.tar.gz 1379520 BLAKE2B c1f2fd552f50d45b8fd6295f911ed0756c552e776c8b1c70f229a3cae83b3167a6dbaaf964ea766235c2522e508b63dd654cae8607184e0416ffe29bd566d01d SHA512 40c584693fa5a0e989fde84453a4914cc21d9630d6c43dc3565f3b2fadca8515ea820fc4a362c4f8799e79710292ae489787d279ddb317d197ee52f840249aea
+DIST cpp-httplib-0.32.0.tar.gz 1380621 BLAKE2B 501e9f6f4076d2a6b2b1526d9b2d39effdd382d9967d546f157472ac4ec9943d6b35fdb66825a3e000698f6be5b7ead6d5ddd658841f24c6da0e8babc424a89f SHA512 09ab022b36ac6a7faf73863a504c460edb975669edfbf6323a4d42d3e4e38e4b6e63bc95ee39b29871730abf5205f9a3bd1ff9a04fc8ba921f1ecf6c357deef4
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.31.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.32.0.ebuild
index ef33c789fd1b..7909eb74ea82 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.31.0.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.32.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{11..14} )
 
-inherit meson-multilib python-any-r1
+inherit cmake-multilib python-any-r1 toolchain-funcs
 
 DESCRIPTION="C++ HTTP/HTTPS server and client library"
 HOMEPAGE="https://github.com/yhirose/cpp-httplib/"
@@ -25,7 +25,7 @@ LICENSE="MIT"
 SLOT="0/$(ver_cut 0-2)"  # soversion
 
 IUSE="brotli mbedtls ssl test zlib zstd"
-REQUIRED_USE="test? ( ssl )"
+REQUIRED_USE="test? ( brotli zlib zstd )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -51,29 +51,32 @@ DEPEND="
 		net-misc/curl
 	)
 "
-BDEPEND="${PYTHON_DEPS}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
 
 PATCHES=(
-	"${FILESDIR}"/cpp-httplib-0.31.0-mbedtls.patch
-	"${FILESDIR}"/cpp-httplib-0.31.0-mbedtls-3.patch
+	"${FILESDIR}/cpp-httplib-0.32.0-cmake-mbedtls.patch"
 )
 
-src_prepare() {
-	default
-	rm -r test/gtest || die
-}
-
 src_configure() {
-	local emesonargs=(
-		-Dcompile=true
-		$(meson_feature zlib)
-		$(meson_feature zstd)
-		$(meson_feature brotli)
-		$(meson_feature ssl)
-		$(usex mbedtls -Dssl_backend=mbedtls -Dssl_backend=openssl)
-		$(meson_use test)
+	local -a mycmakeargs=(
+		-DHTTPLIB_COMPILE=yes
+		-DHTTPLIB_SHARED=yes
+		-DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no
+		-DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no
+		-DHTTPLIB_USE_MBEDTLS_IF_AVAILABLE=no
+		-DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no
+		-DHTTPLIB_USE_ZSTD_IF_AVAILABLE=no
+		-DHTTPLIB_REQUIRE_BROTLI=$(usex brotli)
+		-DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl $(usex mbedtls no yes))
+		-DHTTPLIB_REQUIRE_MBEDTLS=$(usex ssl $(usex mbedtls))
+		-DHTTPLIB_REQUIRE_ZLIB=$(usex zlib)
+		-DHTTPLIB_REQUIRE_ZSTD=$(usex zstd)
+		-DPython3_EXECUTABLE="${PYTHON}"
 	)
-	meson-multilib_src_configure
+	cmake-multilib_src_configure
 }
 
 multilib_src_test() {
@@ -83,16 +86,18 @@ multilib_src_test() {
 		return
 	fi
 
+	cp -p -R --reflink=auto "${S}/test" ./test || die
+
 	local -a failing_tests=(
 		# Disable all online tests.
 		"*.*_Online"
-		# https://github.com/yhirose/cpp-httplib/issues/2351
-		SSLClientTest.UpdateCAStoreWithPem
 	)
 
 	# Little dance to please the GTEST filter (join array using ":").
-	local failing_tests_str="${failing_tests[@]}"
-	local failing_tests_filter="${failing_tests_str// /:}"
+	failing_tests_str="${failing_tests[@]}"
+	failing_tests_filter="${failing_tests_str// /:}"
 
-	GTEST_FILTER="-${failing_tests_filter}" meson_src_test
+	# PREFIX is . to avoid calling "brew" and relying on stuff in /opt
+	GTEST_FILTER="-${failing_tests_filter}" emake -C test \
+		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=.
 }
diff --git a/dev-cpp/cpp-httplib/files/cpp-httplib-0.31.0-mbedtls-3.patch b/dev-cpp/cpp-httplib/files/cpp-httplib-0.31.0-mbedtls-3.patch
deleted file mode 100644
index 51d1e0bc6cd2..000000000000
--- a/dev-cpp/cpp-httplib/files/cpp-httplib-0.31.0-mbedtls-3.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Gentoo: use slotted mbedtls
-
---- a/meson.build
-+++ b/meson.build
-@@ -49,9 +49,9 @@ if get_option('ssl').allowed()
-       ssl_found = true
-     endif
-   else
--    mbedtls_dep = dependency('mbedtls', required: get_option('ssl'))
--    mbedtlsx509_dep = dependency('mbedx509', required: get_option('ssl'))
--    mbedtlscrypto_dep = dependency('mbedcrypto', required: get_option('ssl'))
-+    mbedtls_dep = dependency('mbedtls-3', required: get_option('ssl'))
-+    mbedtlsx509_dep = dependency('mbedx509-3', required: get_option('ssl'))
-+    mbedtlscrypto_dep = dependency('mbedcrypto-3', required: get_option('ssl'))
-     if mbedtls_dep.found() and mbedtlsx509_dep.found() and mbedtlscrypto_dep.found()
-       deps += mbedtls_dep
-       deps += mbedtlsx509_dep
diff --git a/dev-cpp/cpp-httplib/files/cpp-httplib-0.31.0-mbedtls.patch b/dev-cpp/cpp-httplib/files/cpp-httplib-0.31.0-mbedtls.patch
deleted file mode 100644
index a113eb8ca8b9..000000000000
--- a/dev-cpp/cpp-httplib/files/cpp-httplib-0.31.0-mbedtls.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://github.com/yhirose/cpp-httplib/pull/2350
-
-Add support for mbedtls to meson
-
---- a/meson.build
-+++ b/meson.build
-@@ -39,11 +39,29 @@ endif
- deps = [dependency('threads')]
- args = []
- 
--openssl_dep = dependency('openssl', version: '>=3.0.0', required: get_option('openssl'))
--if openssl_dep.found()
--  deps += openssl_dep
--  args += '-DCPPHTTPLIB_OPENSSL_SUPPORT'
--  if host_machine.system() == 'darwin'
-+if get_option('ssl').allowed()
-+  ssl_found = false
-+  if get_option('ssl_backend') == 'openssl'
-+    openssl_dep = dependency('openssl', version: '>=3.0.0', required: get_option('ssl'))
-+    if openssl_dep.found()
-+      deps += openssl_dep
-+      args += '-DCPPHTTPLIB_OPENSSL_SUPPORT'
-+      ssl_found = true
-+    endif
-+  else
-+    mbedtls_dep = dependency('mbedtls', required: get_option('ssl'))
-+    mbedtlsx509_dep = dependency('mbedx509', required: get_option('ssl'))
-+    mbedtlscrypto_dep = dependency('mbedcrypto', required: get_option('ssl'))
-+    if mbedtls_dep.found() and mbedtlsx509_dep.found() and mbedtlscrypto_dep.found()
-+      deps += mbedtls_dep
-+      deps += mbedtlsx509_dep
-+      deps += mbedtlscrypto_dep
-+      args += '-DCPPHTTPLIB_MBEDTLS_SUPPORT'
-+      ssl_found = true
-+    endif
-+  endif
-+
-+  if ssl_found and host_machine.system() == 'darwin'
-     macosx_keychain_dep = dependency('appleframeworks', modules: ['CFNetwork', 'CoreFoundation', 'Security'], required: get_option('macosx_keychain'))
-     if macosx_keychain_dep.found()
-         deps += macosx_keychain_dep
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -2,7 +2,8 @@
- #
- # SPDX-License-Identifier: MIT
- 
--option('openssl', type: 'feature', value: 'auto', description: 'Enable OpenSSL support')
-+option('ssl',     type: 'feature', description: 'Enable SSL support')
-+option('ssl_backend', type: 'combo', choices: ['openssl', 'mbedtls'], value: 'openssl', description: 'Which SSL library to use')
- option('zlib',    type: 'feature', value: 'auto', description: 'Enable zlib support')
- option('brotli',  type: 'feature', value: 'auto', description: 'Enable Brotli support')
- option('zstd',    type: 'feature', value: 'auto', description: 'Enable zstd support')
-@@ -12,6 +13,7 @@ option('compile', type: 'boolean', value: false,  description: 'Split the header
- option('test',    type: 'boolean', value: false,  description: 'Build tests')
- 
- # Old option names
-+option('openssl', type: 'feature', deprecated: 'ssl')
- option('cpp-httplib_openssl', type: 'feature', deprecated: 'openssl')
- option('cpp-httplib_zlib',    type: 'feature', deprecated: 'zlib')
- option('cpp-httplib_brotli',  type: 'feature', deprecated: 'brotli')
diff --git a/dev-cpp/cpp-httplib/files/cpp-httplib-0.32.0-cmake-mbedtls.patch b/dev-cpp/cpp-httplib/files/cpp-httplib-0.32.0-cmake-mbedtls.patch
new file mode 100644
index 000000000000..e2f50bb64f03
--- /dev/null
+++ b/dev-cpp/cpp-httplib/files/cpp-httplib-0.32.0-cmake-mbedtls.patch
@@ -0,0 +1,181 @@
+https://github.com/yhirose/cpp-httplib/pull/2360
+
+From 6f34a08c6e5df97481b926fdbfe650fd6faeb36f Mon Sep 17 00:00:00 2001
+From: Matheus Gabriel Werny <matheusgwdl@protonmail.com>
+Date: Wed, 11 Feb 2026 14:18:24 +0100
+Subject: [PATCH 1/2] [CMake] New component MbedTLS
+
+New component MbedTLS.
+---
+ CMakeLists.txt               | 27 ++++++++++++++++++++++++++-
+ cmake/httplibConfig.cmake.in |  7 +++++++
+ 2 files changed, 33 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 45a0e16b98..a11d0c66a9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,11 +2,13 @@
+ 	Build options:
+ 	* Standard BUILD_SHARED_LIBS is supported and sets HTTPLIB_SHARED default value.
+ 	* HTTPLIB_USE_OPENSSL_IF_AVAILABLE (default on)
++	* HTTPLIB_USE_MBEDTLS_IF_AVAILABLE (default off)
+ 	* HTTPLIB_USE_ZLIB_IF_AVAILABLE (default on)
+ 	* HTTPLIB_USE_BROTLI_IF_AVAILABLE (default on)
+ 	* HTTPLIB_USE_ZSTD_IF_AVAILABLE (default on)
+ 	* HTTPLIB_BUILD_MODULES (default off)
+ 	* HTTPLIB_REQUIRE_OPENSSL (default off)
++	* HTTPLIB_REQUIRE_MBEDTLS (default off)
+ 	* HTTPLIB_REQUIRE_ZLIB (default off)
+ 	* HTTPLIB_REQUIRE_BROTLI (default off)
+ 	* HTTPLIB_REQUIRE_ZSTD (default off)
+@@ -21,7 +23,7 @@
+ 
+ 	-------------------------------------------------------------------------------
+ 
+-	After installation with Cmake, a find_package(httplib COMPONENTS OpenSSL ZLIB Brotli zstd) is available.
++	After installation with Cmake, a find_package(httplib COMPONENTS OpenSSL MbedTLS ZLIB Brotli zstd) is available.
+ 	This creates a httplib::httplib target (if found and if listed components are supported).
+ 	It can be linked like so:
+ 
+@@ -48,6 +50,7 @@
+ 	These variables are available after you run find_package(httplib)
+ 	* HTTPLIB_HEADER_PATH - this is the full path to the installed header (e.g. /usr/include/httplib.h).
+ 	* HTTPLIB_IS_USING_OPENSSL - a bool for if OpenSSL support is enabled.
++	* HTTPLIB_IS_USING_MBEDTLS - a bool for if MbedTLS support is enabled.
+ 	* HTTPLIB_IS_USING_ZLIB - a bool for if ZLIB support is enabled.
+ 	* HTTPLIB_IS_USING_BROTLI - a bool for if Brotli support is enabled.
+ 	* HTTPLIB_IS_USING_ZSTD - a bool for if ZSTD support is enabled.
+@@ -95,10 +98,12 @@ set(_HTTPLIB_OPENSSL_MIN_VER "3.0.0")
+ option(HTTPLIB_NO_EXCEPTIONS "Disable the use of C++ exceptions" OFF)
+ # Allow for a build to require OpenSSL to pass, instead of just being optional
+ option(HTTPLIB_REQUIRE_OPENSSL "Requires OpenSSL to be found & linked, or fails build." OFF)
++option(HTTPLIB_REQUIRE_MBEDTLS "Requires MbedTLS to be found & linked, or fails build." OFF)
+ option(HTTPLIB_REQUIRE_ZLIB "Requires ZLIB to be found & linked, or fails build." OFF)
+ # Allow for a build to casually enable OpenSSL/ZLIB support, but silently continue if not found.
+ # Make these options so their automatic use can be specifically disabled (as needed)
+ option(HTTPLIB_USE_OPENSSL_IF_AVAILABLE "Uses OpenSSL (if available) to enable HTTPS support." ON)
++option(HTTPLIB_USE_MBEDTLS_IF_AVAILABLE "Uses MbedTLS (if available) to enable HTTPS support." OFF)
+ option(HTTPLIB_USE_ZLIB_IF_AVAILABLE "Uses ZLIB (if available) to enable Zlib compression support." ON)
+ # Lets you compile the program as a regular library instead of header-only
+ option(HTTPLIB_COMPILE "If ON, uses a Python script to split the header into a compilable header & source file (requires Python v3)." OFF)
+@@ -120,6 +125,15 @@ else()
+ 		message(WARNING "HTTPLIB_BUILD_MODULES requires CMake 3.28 or later. Current version is ${CMAKE_VERSION}. Modules support has been disabled.")
+ 	endif()
+ endif()
++
++if(HTTPLIB_REQUIRE_OPENSSL AND HTTPLIB_REQUIRE_MBEDTLS)
++	message(FATAL_ERROR "HTTPLIB_REQUIRE_OPENSSL and HTTPLIB_REQUIRE_MBEDTLS are mutually exclusive.")
++endif()
++
++if(HTTPLIB_USE_OPENSSL_IF_AVAILABLE AND HTTPLIB_USE_MBEDTLS_IF_AVAILABLE)
++	message(FATAL_ERROR "HTTPLIB_USE_OPENSSL_IF_AVAILABLE and HTTPLIB_USE_MBEDTLS_IF_AVAILABLE are mutually exclusive.")
++endif()
++
+ # Defaults to static library but respects standard BUILD_SHARED_LIBS if set
+ include(CMakeDependentOption)
+ cmake_dependent_option(HTTPLIB_SHARED "Build the library as a shared library instead of static. Has no effect if using header-only."
+@@ -173,6 +187,15 @@ elseif(HTTPLIB_USE_OPENSSL_IF_AVAILABLE)
+ 	endif()
+ endif()
+ 
++if(HTTPLIB_REQUIRE_MBEDTLS)
++	find_package(MbedTLS REQUIRED)
++	set(HTTPLIB_IS_USING_MBEDTLS TRUE)
++elseif(HTTPLIB_USE_MBEDTLS_IF_AVAILABLE)
++	find_package(MbedTLS QUIET)
++	message(WARNING ${MbedTLS_FOUND}) # TODO
++	set(HTTPLIB_IS_USING_MBEDTLS ${MbedTLS_FOUND})
++endif()
++
+ if(HTTPLIB_REQUIRE_ZLIB)
+ 	find_package(ZLIB REQUIRED)
+ 	set(HTTPLIB_IS_USING_ZLIB TRUE)
+@@ -327,6 +350,7 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
+ 		$<$<BOOL:${HTTPLIB_IS_USING_ZSTD}>:zstd::libzstd>
+ 		$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::SSL>
+ 		$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::Crypto>
++		$<$<BOOL:${HTTPLIB_IS_USING_MBEDTLS}>:MbedTLS::mbedtls>
+ )
+ 
+ # Set the definitions to enable optional features
+@@ -336,6 +360,7 @@ target_compile_definitions(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
+ 	$<$<BOOL:${HTTPLIB_IS_USING_ZLIB}>:CPPHTTPLIB_ZLIB_SUPPORT>
+ 	$<$<BOOL:${HTTPLIB_IS_USING_ZSTD}>:CPPHTTPLIB_ZSTD_SUPPORT>
+ 	$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:CPPHTTPLIB_OPENSSL_SUPPORT>
++	$<$<BOOL:${HTTPLIB_IS_USING_MBEDTLS}>:CPPHTTPLIB_MBEDTLS_SUPPORT>
+ 	$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>,$<BOOL:${HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN}>>:CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN>
+ 	$<$<BOOL:${HTTPLIB_USE_NON_BLOCKING_GETADDRINFO}>:CPPHTTPLIB_USE_NON_BLOCKING_GETADDRINFO>
+ )
+diff --git a/cmake/httplibConfig.cmake.in b/cmake/httplibConfig.cmake.in
+index 8ca8b991a2..0790f456d8 100644
+--- a/cmake/httplibConfig.cmake.in
++++ b/cmake/httplibConfig.cmake.in
+@@ -4,6 +4,7 @@
+ # Setting these here so they're accessible after install.
+ # Might be useful for some users to check which settings were used.
+ set(HTTPLIB_IS_USING_OPENSSL @HTTPLIB_IS_USING_OPENSSL@)
++set(HTTPLIB_IS_USING_MBEDTLS @HTTPLIB_IS_USING_MBEDTLS@)
+ set(HTTPLIB_IS_USING_ZLIB @HTTPLIB_IS_USING_ZLIB@)
+ set(HTTPLIB_IS_COMPILED @HTTPLIB_COMPILE@)
+ set(HTTPLIB_IS_USING_BROTLI @HTTPLIB_IS_USING_BROTLI@)
+@@ -25,11 +26,17 @@ if(@HTTPLIB_IS_USING_OPENSSL@)
+ 	endif()
+ 	set(httplib_OpenSSL_FOUND ${OpenSSL_FOUND})
+ endif()
++
+ if(@HTTPLIB_IS_USING_ZLIB@)
+ 	find_dependency(ZLIB)
+ 	set(httplib_ZLIB_FOUND ${ZLIB_FOUND})
+ endif()
+ 
++if(@HTTPLIB_IS_USING_MBEDTLS@)
++	find_dependency(MbedTLS)
++	set(httplib_MbedTLS_FOUND ${MbedTLS_FOUND})
++endif()
++
+ if(@HTTPLIB_IS_USING_BROTLI@)
+ 	# Needed so we can use our own FindBrotli.cmake in this file.
+ 	# Note that the FindBrotli.cmake file is installed in the same dir as this file.
+
+From 8682189e5929abecb5e8e41b43180d931995154a Mon Sep 17 00:00:00 2001
+From: Matheus Gabriel Werny <matheusgwdl@protonmail.com>
+Date: Wed, 11 Feb 2026 14:46:36 +0100
+Subject: [PATCH 2/2] Fix case
+
+Fix case: HTTPLIB_REQUIRE_OPENSSL=OFF; HTTPLIB_REQUIRE_MBEDTLS=ON
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a11d0c66a9..a2864a6ce1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -126,6 +126,7 @@ else()
+ 	endif()
+ endif()
+ 
++# Incompatibility between OpenSSL and MbedTLS
+ if(HTTPLIB_REQUIRE_OPENSSL AND HTTPLIB_REQUIRE_MBEDTLS)
+ 	message(FATAL_ERROR "HTTPLIB_REQUIRE_OPENSSL and HTTPLIB_REQUIRE_MBEDTLS are mutually exclusive.")
+ endif()
+@@ -134,6 +135,10 @@ if(HTTPLIB_USE_OPENSSL_IF_AVAILABLE AND HTTPLIB_USE_MBEDTLS_IF_AVAILABLE)
+ 	message(FATAL_ERROR "HTTPLIB_USE_OPENSSL_IF_AVAILABLE and HTTPLIB_USE_MBEDTLS_IF_AVAILABLE are mutually exclusive.")
+ endif()
+ 
++if(HTTPLIB_REQUIRE_MBEDTLS)
++	set(HTTPLIB_USE_OPENSSL_IF_AVAILABLE OFF)
++endif()
++
+ # Defaults to static library but respects standard BUILD_SHARED_LIBS if set
+ include(CMakeDependentOption)
+ cmake_dependent_option(HTTPLIB_SHARED "Build the library as a shared library instead of static. Has no effect if using header-only."
+@@ -192,7 +197,6 @@ if(HTTPLIB_REQUIRE_MBEDTLS)
+ 	set(HTTPLIB_IS_USING_MBEDTLS TRUE)
+ elseif(HTTPLIB_USE_MBEDTLS_IF_AVAILABLE)
+ 	find_package(MbedTLS QUIET)
+-	message(WARNING ${MbedTLS_FOUND}) # TODO
+ 	set(HTTPLIB_IS_USING_MBEDTLS ${MbedTLS_FOUND})
+ endif()
+