From c5b225c8cafcc440fda45603bfc69f3dfc278baf Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Wed, 19 Nov 2014 16:48:23 +0100 Subject: cmake: fix NTLM detection when CURL_DISABLE_HTTP defined Updated following changes in commit f0d860d. Acked-by: Brad King Signed-off-by: Peter Wu --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 57575f4a2..a735c1923 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1030,11 +1030,11 @@ _add_if("SPNEGO" 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) -- cgit v1.2.3