Don't list NTLM in curl-config when HTTP is disabled

Also, fixed Curl_proxyCONNECT() stub with HTTP disabled.

diff --git a/configure.ac b/configure.ac
index 343ac0d834fb6b6c232be9f75b82587b2d9b265d..628666ba86819c7d76ad8c946ef6131fb8fbc2a4 100644 (file)
--- 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 271b98a6e2d425492b5d16f79c059a4f36d1fe3d..5ea0a21af77994a60c8c552391efc52259cf5e14 100644 (file)
--- 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