curl-library
[PATCH v2] cmake: fix NTLM detection and add Kerberos feature
From: Peter Wu <peter_at_lekensteyn.nl>
Date: Wed, 19 Nov 2014 16:48:23 +0100
Date: Wed, 19 Nov 2014 16:48:23 +0100
Based on recent configure patches:
eda919f configure: Added krb5 to the supported features
f0d860d configure: Fixed NTLM missing from features when CURL_DISABLE_HTTP defined
fe0f896 configure: assume krb5 when gss-api works
676d62f configure: Fixed inclusion of krb5 when CURL_DISABLE_CRYPTO_AUTH is defined
a4b7f71 tool: Use Kerberos for supported feature
Acked-by: Brad King <brad.king_at_kitware.com>
Signed-off-by: Peter Wu <peter_at_lekensteyn.nl>
--- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57575f4..17eacfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1028,13 +1028,15 @@ _add_if("GSS-API" HAVE_GSS_API) # TODO SSP1 missing for SPNEGO _add_if("SPNEGO" NOT CURL_DISABLE_CRYPTO_AUTH AND (HAVE_GSS_API OR USE_WINDOWS_SSPI)) +_add_if("Kerberos" NOT CURL_DISABLE_CRYPTO_AUTH AND + (HAVE_GSS_API OR USE_WINDOWS_SSPI)) # NTLM support requires crypto function adaptions from various SSL libs # TODO alternative SSL libs tests for SSP1, GNUTLS, NSS, DARWINSSL -if(NOT CURL_DISABLE_HTTP AND NOT CURL_DISABLE_CRYPTO_AUTH AND (USE_OPENSSL OR +if(NOT CURL_DISABLE_CRYPTO_AUTH AND (USE_OPENSSL OR USE_WINDOWS_SSPI OR GNUTLS_ENABLED OR NSS_ENABLED OR DARWINSSL_ENABLED)) _add_if("NTLM" 1) # TODO missing option (autoconf: --enable-ntlm-wb) - _add_if("NTLM_WB" NTLM_WB_ENABLED) + _add_if("NTLM_WB" NOT CURL_DISABLE_HTTP AND NTLM_WB_ENABLED) endif() # TODO missing option (--enable-tls-srp), depends on GNUTLS_SRP/OPENSSL_SRP _add_if("TLS-SRP" USE_TLS_SRP) -- 2.1.2 ------------------------------------------------------------------- List admin: http://cool.haxx.se/list/listinfo/curl-library Etiquette: http://curl.haxx.se/mail/etiquette.htmlReceived on 2014-11-19