summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-29 13:59:20 -0700
committerJunio C Hamano <gitster@pobox.com>2015-10-29 13:59:20 -0700
commit9627b0a49f692f45865b6b59b6ef7dbf1c081820 (patch)
treeffe5eba323396f3e7fe46c43e3602490c8389e89 /configure.ac
parent69fe31887bf8be496bb0adb4db3150cec52e1a2c (diff)
parent7e91e8d73a757801c0604a03fd2f0fa8003e4ac0 (diff)
downloadgit-9627b0a49f692f45865b6b59b6ef7dbf1c081820.tar.gz
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
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac23
1 files changed, 23 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 3fcca618d2..76170ad06d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -521,10 +521,33 @@ AC_CHECK_LIB([curl], [curl_global_init],
[NO_CURL=],
[NO_CURL=YesPlease])
+if test -z "${NO_CURL}" && test -z "${NO_OPENSSL}"; then
+
+AC_CHECK_LIB([curl], [Curl_ssl_init],
+[NEEDS_SSL_WITH_CURL=YesPlease],
+[NEEDS_SSL_WITH_CURL=])
+
+GIT_CONF_SUBST([NEEDS_SSL_WITH_CURL])
+
+fi
+
GIT_UNSTASH_FLAGS($CURLDIR)
GIT_CONF_SUBST([NO_CURL])
+if test -z "$NO_CURL"; then
+
+AC_CHECK_PROG([CURL_CONFIG], [curl-config],
+[curl-config],
+[no])
+
+if test $CURL_CONFIG != no; then
+ GIT_CONF_SUBST([CURL_CONFIG])
+fi
+
+fi
+
+
#
# Define NO_EXPAT if you do not have expat installed. git-http-push is
# not built, and you cannot push using http:// and https:// transports.