From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Feb 2015 20:28:29 +0000 (-0800)
Subject: Merge branch 'tc/curl-vernum-output-broken-in-7.11'
X-Git-Tag: v2.4.0-rc0~98
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c0997feda811663182d1ae9f596a769de9e801f7?ds=inline;hp=-c

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
---

c0997feda811663182d1ae9f596a769de9e801f7
diff --combined Makefile
index e8ce649ca1,20058f1de7..44f1dd10ff
--- a/Makefile
+++ b/Makefile
@@@ -348,15 -348,6 +348,15 @@@ all:
  #
  # Define NO_HMAC_CTX_CLEANUP if your OpenSSL is version 0.9.6b or earlier to
  # cleanup the HMAC context with the older HMAC_cleanup function.
 +#
 +# Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
 +# compiles the following initialization:
 +#
 +#   static const char s[] = ("FOO");
 +#
 +# and define it to "no" if you need to remove the parentheses () around the
 +# constant.  The default is "auto", which means to use parentheses if your
 +# compiler is detected to support it.
  
  GIT-VERSION-FILE: FORCE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -964,14 -955,6 +964,14 @@@ ifneq (,$(SOCKLEN_T)
  	BASIC_CFLAGS += -Dsocklen_t=$(SOCKLEN_T)
  endif
  
 +ifeq (yes,$(USE_PARENS_AROUND_GETTEXT_N))
 +	BASIC_CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=1
 +else
 +ifeq (no,$(USE_PARENS_AROUND_GETTEXT_N))
 +	BASIC_CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=0
 +endif
 +endif
 +
  ifeq ($(uname_S),Darwin)
  	ifndef NO_FINK
  		ifeq ($(shell test -d /sw/lib && echo y),y)
@@@ -1052,13 -1035,13 +1052,13 @@@ els
  	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