[PATCH] Fix support for old libcurl

Old libcurl has curl_easy_setopt(), and http-pull requires it; it just
doesn't have one of the options.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/http-pull.c b/http-pull.c
index da4d65ab9b95eaabdde8e6ddd308d7d8cd7e036b..38047e695b8dfabbdbe824486b1fae9ff5664ea4 100644 (file)
--- a/http-pull.c
+++ b/http-pull.c
@@ -12,9 +12,6 @@
 #if LIBCURL_VERSION_NUM < 0x070800
 #define curl_global_init(a) do { /* nothing */ } while(0)
 #endif
 #if LIBCURL_VERSION_NUM < 0x070800
 #define curl_global_init(a) do { /* nothing */ } while(0)
 #endif

-#if LIBCURL_VERSION_NUM < 0x070907
-#define curl_easy_setopt(a, b, c) do { /* nothing */ } while(0)
-#endif

 
 static CURL *curl;
 
 
 static CURL *curl;
 


@@ -187,7 +184,9 @@ int main(int argc, char **argv)
 
        curl_ssl_verify = gitenv("GIT_SSL_NO_VERIFY") ? 0 : 1;
        curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, curl_ssl_verify);
 
        curl_ssl_verify = gitenv("GIT_SSL_NO_VERIFY") ? 0 : 1;
        curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, curl_ssl_verify);

+#if LIBCURL_VERSION_NUM >= 0x070907

        curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
        curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);

+#endif

 
        base = url;
 
 
        base = url;