From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Nov 2015 20:18:08 +0000 (-0800)
Subject: Merge branch 'rp/link-curl-before-ssl' into maint
X-Git-Tag: v2.6.3~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3897d2d906df0edebd78b8d9604d02cd120bac36;p=git

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

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

3897d2d906df0edebd78b8d9604d02cd120bac36
diff --cc Makefile
index 04c2231023,64d17d0dc5..944d2c3af5
--- a/Makefile
+++ b/Makefile
@@@ -1995,16 -1993,16 +2000,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