]> granicus.if.org Git - curl/commitdiff
cmake: fix NTLM detection when CURL_DISABLE_HTTP defined
authorPeter Wu <peter_at_lekensteyn.nl>
Wed, 19 Nov 2014 15:48:23 +0000 (16:48 +0100)
committerSteve Holme <steve_holme@hotmail.com>
Wed, 19 Nov 2014 19:46:03 +0000 (19:46 +0000)
Updated following changes in commit f0d860d.

Acked-by: Brad King <brad.king@kitware.com>
Signed-off-by: Peter Wu <peter@lekensteyn.nl>
CMakeLists.txt

index 57575f4a2da600dc4c6a253e3f3fbcd25ce0eff6..a735c19234ec4e1fcd88247a2f11335dd0a3ce32 100644 (file)
@@ -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)