From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Oct 2015 20:59:20 +0000 (-0700)
Subject: Merge branch 'rp/link-curl-before-ssl'
X-Git-Tag: v2.7.0-rc0~65
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9627b0a49f692f45865b6b59b6ef7dbf1c081820?ds=inline;hp=--cc

Merge branch 'rp/link-curl-before-ssl'

The linkage order of libraries was wrong in places around libcurl.

* rp/link-curl-before-ssl:
configure.ac: detect ssl need with libcurl
Makefile: make curl-config path configurable
Makefile: link libcurl before zlib
---

9627b0a49f692f45865b6b59b6ef7dbf1c081820
diff --cc Makefile
index 8466333027,64d17d0dc5..e0717b0fa1
--- a/Makefile
+++ b/Makefile
@@@ -1992,16 -1993,16 +1997,16 @@@ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_P
  
  $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
- 		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
+ 		$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
  
  $(LIB_FILE): $(LIB_OBJS)
 -	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
 +	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
  
  $(XDIFF_LIB): $(XDIFF_OBJS)
 -	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
 +	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
  
  $(VCSSVN_LIB): $(VCSSVN_OBJS)
 -	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
 +	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
  
  export DEFAULT_EDITOR DEFAULT_PAGER