diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-22 20:28:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-22 20:28:29 (GMT) |
| commit | c0997feda811663182d1ae9f596a769de9e801f7 (patch) | |
| tree | d0f14d7d053b75fc00e9211bbd58157d46f61a7e /Makefile | |
| parent | 7cf6232e2c15a0052c78655d7014645cd20a377c (diff) | |
| parent | 3af67924e03ddb29a2b698266a9f27ef30cd663b (diff) | |
| download | git-c0997feda811663182d1ae9f596a769de9e801f7.zip git-c0997feda811663182d1ae9f596a769de9e801f7.tar.gz git-c0997feda811663182d1ae9f596a769de9e801f7.tar.bz2 | |
Merge branch 'tc/curl-vernum-output-broken-in-7.11'
Certain older vintages of cURL give irregular output from
"curl-config --vernum", which confused our build system.
* tc/curl-vernum-output-broken-in-7.11:
Makefile: handle broken curl version number in version check
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1052,13 +1052,13 @@ else REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES) PROGRAM_OBJS += http-fetch.o PROGRAMS += $(REMOTE_CURL_NAMES) - curl_check := $(shell (echo 070908; curl-config --vernum) 2>/dev/null | sort -r | sed -ne 2p) + curl_check := $(shell (echo 070908; curl-config --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) ifeq "$(curl_check)" "070908" ifndef NO_EXPAT PROGRAM_OBJS += http-push.o endif endif - curl_check := $(shell (echo 072200; curl-config --vernum) 2>/dev/null | sort -r | sed -ne 2p) + curl_check := $(shell (echo 072200; curl-config --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) ifeq "$(curl_check)" "072200" USE_CURL_FOR_IMAP_SEND = YesPlease endif |