diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-14 15:03:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-14 15:10:22 (GMT) |
| commit | a3ef36f153f51c33ea2154cff17bbf9abb7ee073 (patch) | |
| tree | 94283929f1d08444c255a490d10810d7c5df0e04 /Utilities/cmcurl/lib/curl_setup.h | |
| parent | 91101f108d68e8fe98c378f06e1ed12a513151fe (diff) | |
| parent | 06d6d6c4aee149cd6560b919ef6935ef0867d921 (diff) | |
| download | CMake-a3ef36f153f51c33ea2154cff17bbf9abb7ee073.zip CMake-a3ef36f153f51c33ea2154cff17bbf9abb7ee073.tar.gz CMake-a3ef36f153f51c33ea2154cff17bbf9abb7ee073.tar.bz2 | |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2017-06-14 (54b636f1)
Resolve a logical conflict in `Utilities/cmcurl/CMakeLists.txt`
by disabling CA bundle/path detection for build within CMake.
CMake already handles locating a CA bundle/path at runtime.
Diffstat (limited to 'Utilities/cmcurl/lib/curl_setup.h')
| -rw-r--r-- | Utilities/cmcurl/lib/curl_setup.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Utilities/cmcurl/lib/curl_setup.h b/Utilities/cmcurl/lib/curl_setup.h index 6ab18cd..a6268ad 100644 --- a/Utilities/cmcurl/lib/curl_setup.h +++ b/Utilities/cmcurl/lib/curl_setup.h @@ -603,11 +603,15 @@ int netware_init(void); #endif #endif -#if defined(HAVE_LIBIDN2) && defined(HAVE_IDN2_H) +#if defined(HAVE_LIBIDN2) && defined(HAVE_IDN2_H) && !defined(USE_WIN32_IDN) /* The lib and header are present */ #define USE_LIBIDN2 #endif +#if defined(USE_LIBIDN2) && defined(USE_WIN32_IDN) +#error "Both libidn2 and WinIDN are enabled, choose one." +#endif + #ifndef SIZEOF_TIME_T /* assume default size of time_t to be 32 bit */ #define SIZEOF_TIME_T 4 @@ -638,14 +642,14 @@ int netware_init(void); #if !defined(CURL_DISABLE_NTLM) && !defined(CURL_DISABLE_CRYPTO_AUTH) #if defined(USE_OPENSSL) || defined(USE_WINDOWS_SSPI) || \ defined(USE_GNUTLS) || defined(USE_NSS) || defined(USE_DARWINSSL) || \ - defined(USE_OS400CRYPTO) || defined(USE_WIN32_CRYPTO) + defined(USE_OS400CRYPTO) || defined(USE_WIN32_CRYPTO) || \ + defined(USE_MBEDTLS) #define USE_NTLM -#elif defined(USE_MBEDTLS) +# if defined(USE_MBEDTLS) +/* Get definition of MBEDTLS_MD4_C */ # include <mbedtls/md4.h> -# if defined(MBEDTLS_MD4_C) -#define USE_NTLM # endif #endif |