diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2011-04-05 22:28:26 -0700 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2011-04-05 22:29:21 -0700 |
| commit | 6eb484942b011aceb1ca00d7a126c07d06e6eea9 (patch) | |
| tree | 1d1f8b665d60650096b40ee54da49496d219a560 | |
| parent | 5b716b7c91d50d9351567f6dcbd76dcc803f0c27 (diff) | |
Don't list NTLM in curl-config when HTTP is disabled
Also, fixed Curl_proxyCONNECT() stub with HTTP disabled.
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | 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 |