only enable NTLM if HTTP and NTLM is not disabled, and if NTLM is disabled

we define an empty macro for the ntlm cleanup function

diff --git a/lib/http_ntlm.h b/lib/http_ntlm.h
index c4e669b..a8de220 100644 (file)
--- a/lib/http_ntlm.h
+++ b/lib/http_ntlm.h
@@ -39,8 +39,7 @@ CURLntlm Curl_input_ntlm(struct connectdata *conn, bool proxy, char *header);
 CURLcode Curl_output_ntlm(struct connectdata *conn, bool proxy);
 
 void Curl_ntlm_cleanup(struct connectdata *conn);
-#if (!defined(USE_SSLEAY) && !defined(USE_WINDOWS_SSPI)) || \
-    defined(CURL_DISABLE_HTTP)
+#ifndef USE_NTLM
 #define Curl_ntlm_cleanup(x)
 #endif
 

diff --git a/lib/setup.h b/lib/setup.h
index ce0fc50..bebe4e8 100644 (file)
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -301,9 +301,11 @@ typedef int curl_socket_t;
 #define USE_SSL    /* Either OpenSSL || GnuTLS */
 #endif
 
+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_NTLM)
 #if defined(USE_SSLEAY) || defined(USE_WINDOWS_SSPI)
 #define USE_NTLM
 #endif
+#endif
 
 #ifdef CURLDEBUG
 #define DEBUGF(x) x