From 6eb484942b011aceb1ca00d7a126c07d06e6eea9 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Tue, 5 Apr 2011 22:28:26 -0700 Subject: Don't list NTLM in curl-config when HTTP is disabled Also, fixed Curl_proxyCONNECT() stub with HTTP disabled. --- configure.ac | 8 +++++--- lib/http_proxy.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 343ac0d83..628666ba8 100644 --- a/configure.ac +++ b/configure.ac @@ -2938,9 +2938,11 @@ fi if test "x$USE_WINDOWS_SSPI" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES SSPI" fi -if test "x$USE_SSLEAY" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \ - -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1"; then - SUPPORT_FEATURES="$SUPPORT_FEATURES NTLM" +if test "x$CURL_DISABLE_HTTP" != "x1"; then + if test "x$USE_SSLEAY" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \ + -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1"; then + SUPPORT_FEATURES="$SUPPORT_FEATURES NTLM" + fi fi if test "x$USE_TLS_SRP" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES TLS-SRP" diff --git a/lib/http_proxy.h b/lib/http_proxy.h index 271b98a6e..5ea0a21af 100644 --- a/lib/http_proxy.h +++ b/lib/http_proxy.h @@ -29,5 +29,5 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn, #define PROXY_TIMEOUT (3600*1000) #else -#define Curl_proxyCONNECT(x,y,x,w) CURLE_NOT_BUILT_IN +#define Curl_proxyCONNECT(x,y,z,w) CURLE_NOT_BUILT_IN #endif -- cgit v1.2.3