diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:07 -0800 |
| commit | f5a191d3dcbd0deaae9eba2a141e0f086ea0eb20 (patch) | |
| tree | 5902b026e0276dff5c56520cc7b54975d3bdde0a | |
| parent | e591339ce7632f3c9000f0fde8ee4813f061a11e (diff) | |
| parent | 3af67924e03ddb29a2b698266a9f27ef30cd663b (diff) | |
| download | git-f5a191d3dcbd0deaae9eba2a141e0f086ea0eb20.tar.gz git-f5a191d3dcbd0deaae9eba2a141e0f086ea0eb20.tar.xz | |
Merge branch 'tc/curl-vernum-output-broken-in-7.11' into maint
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
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1035,13 +1035,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 |