From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Nov 2015 20:18:10 +0000 (-0800)
Subject: Merge branch 'js/imap-send-curl-compilation-fix' into maint
X-Git-Tag: v2.6.3~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c378862b1ec23dd526e318b4c1bfbf826f8dd6b6?hp=3897d2d906df0edebd78b8d9604d02cd120bac36

Merge branch 'js/imap-send-curl-compilation-fix' into maint

"git imap-send" did not compile well with older version of cURL library.

* js/imap-send-curl-compilation-fix:
imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available
---

diff --git a/imap-send.c b/imap-send.c
index 37ac4aa86a..8c3fc212ba 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1422,11 +1422,15 @@ static CURL *setup_curl(struct imap_server_conf *srvc)
 	curl_easy_setopt(curl, CURLOPT_PORT, server.port);
 
 	if (server.auth_method) {
+#if LIBCURL_VERSION_NUM < 0x072200
+		warning("No LOGIN_OPTIONS support in this cURL version");
+#else
 		struct strbuf auth = STRBUF_INIT;
 		strbuf_addstr(&auth, "AUTH=");
 		strbuf_addstr(&auth, server.auth_method);
 		curl_easy_setopt(curl, CURLOPT_LOGIN_OPTIONS, auth.buf);
 		strbuf_release(&auth);
+#endif
 	}
 
 	if (!server.use_ssl)