summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorRemi Pommarel <repk@triplefau.lt>2015-10-21 19:10:46 +0200
committerJunio C Hamano <gitster@pobox.com>2015-10-21 12:43:31 -0700
commitf89158760d5f02ba59f644799abd921e6be22f13 (patch)
tree8540cf55603b8e43d452175325cd85daa25f1e2b /configure.ac
parent9eaa78b0b037964da85d6a15f0128639f2118a53 (diff)
downloadgit-f89158760d5f02ba59f644799abd921e6be22f13.tar.gz
Makefile: make curl-config path configurable
There are situations, e.g. during cross compilation, where curl-config program is not present in the PATH. Make the makefile use a configurable curl-config program passed through CURL_CONFIG variable which can be set through config.mak. Also make this variable tunable through use of autoconf/configure. Configure will set CURL_CONFIG variable in config.mak.autogen to whatever value has been passed to ac_cv_prog_CURL_CONFIG. Signed-off-by: Remi Pommarel <repk@triplefau.lt> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac13
1 files changed, 13 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 14012fad72..01b07ad990 100644
--- a/configure.ac
+++ b/configure.ac
@@ -525,6 +525,19 @@ 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.