diff options
| author | Brad King <brad.king@kitware.com> | 2023-09-20 17:09:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-09-22 14:55:37 (GMT) |
| commit | c1f76e6c211e9e562328f1c0571e8877599f880e (patch) | |
| tree | f4c879a444b512b178f89ccd5b1c0f4a0db4ee99 /Utilities/cmcurl/lib/curl_hmac.h | |
| parent | 1fb19cbdad18011756945f84d19951a199a399bc (diff) | |
| parent | 017637e40f954e791a895a04855d0411bda61c10 (diff) | |
| download | CMake-c1f76e6c211e9e562328f1c0571e8877599f880e.zip CMake-c1f76e6c211e9e562328f1c0571e8877599f880e.tar.gz CMake-c1f76e6c211e9e562328f1c0571e8877599f880e.tar.bz2 | |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2023-09-13 (6fa1d817)
Upstream significantly refactored `lib/CMakeLists.txt`, so take the
upstream version of everything except the code added by commit
54cb23c657 (curl: Restore installation of OpenSSL DLLs, 2014-11-03,
v3.2.0-rc1~418^2~4). We will apply our customizations again in a
follow-up commit.
Diffstat (limited to 'Utilities/cmcurl/lib/curl_hmac.h')
| -rw-r--r-- | Utilities/cmcurl/lib/curl_hmac.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Utilities/cmcurl/lib/curl_hmac.h b/Utilities/cmcurl/lib/curl_hmac.h index 11625c0..9438ca7 100644 --- a/Utilities/cmcurl/lib/curl_hmac.h +++ b/Utilities/cmcurl/lib/curl_hmac.h @@ -24,7 +24,8 @@ * ***************************************************************************/ -#ifndef CURL_DISABLE_CRYPTO_AUTH +#if (defined(USE_CURL_NTLM_CORE) && !defined(USE_WINDOWS_SSPI)) \ + || !defined(CURL_DISABLE_AWS) #include <curl/curl.h> |