[PATCH v3 1/1] 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 <redacted>
---
 Makefile     |  9 +++++++--
 configure.ac | 13 +++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ce0cfe2..3cba678 100644
--- a/Makefile
+++ b/Makefile

@@ -39,6 +39,10 @@ all::
 # Define CURLDIR=/foo/bar if your curl header and library files are in
 # /foo/bar/include and /foo/bar/lib directories.
 #
+# Define CURL_CONFIG to curl's configuration program that gives informations
+# about the library (ie curl's version, cflags, ...) . If not set it defaults
+# to 'curl-config'.
+#
 # 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 (dumb).
 #

@@ -425,6 +429,7 @@ TCL_PATH = tclsh
 TCLTK_PATH = wish
 XGETTEXT = xgettext
 MSGFMT = msgfmt
+CURL_CONFIG = curl-config
 PTHREAD_LIBS = -lpthread
 PTHREAD_CFLAGS =
 GCOV = gcov

@@ -1059,13 +1064,13 @@ else
 	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 | sed -e '/^70[BC]/s/^/0/') 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 | sed -e '/^70[BC]/s/^/0/') 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

diff --git a/configure.ac b/configure.ac
index 14012fa..01b07ad 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.

-- 
2.0.1

Remi Pommarel wrote:

Signed-off-by: Remi Pommarel <redacted>

For what it's worth, with or without the tweaks below,

Reviewed-by: Jonathan Nieder <redacted>

[...]

Extra spaces, some wording tweaks:

s/gives informations about the library/prints information about the library/
s/(ie curl's version, cflags, .../) /(e.g., its version number)/
s/If not set it defaults to/The default is/

Thanks.

diff --git i/Makefile w/Makefile
index 5a94434..4a870a4 100644
--- i/Makefile
+++ w/Makefile

@@ -39,9 +39,8 @@ all::
 # Define CURLDIR=/foo/bar if your curl header and library files are in
 # /foo/bar/include and /foo/bar/lib directories.
 #
-# Define CURL_CONFIG to curl's configuration program that gives informations
-# about the library (ie curl's version, cflags, ...) . If not set it defaults
-# to 'curl-config'.
+# Define CURL_CONFIG to curl's configuration program that prints information
+# about the library (e.g., its version number).  The default is 'curl-config'.
 #
 # 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 (dumb).

On Mon, Oct 05, 2015 at 01:49:09PM -0700, Jonathan Nieder wrote:

Remi Pommarel wrote:

quoted

Signed-off-by: Remi Pommarel <redacted>

For what it's worth, with or without the tweaks below,

Reviewed-by: Jonathan Nieder <redacted>

Thanks.

[...]

quoted

--- a/Makefile
+++ b/Makefile

@@ -39,6 +39,10 @@ all::
 # Define CURLDIR=/foo/bar if your curl header and library files are in
 # /foo/bar/include and /foo/bar/lib directories.
 #
+# Define CURL_CONFIG to curl's configuration program that gives informations
+# about the library (ie curl's version, cflags, ...) . If not set it defaults
+# to 'curl-config'.

Extra spaces, some wording tweaks:

s/gives informations about the library/prints information about the library/
s/(ie curl's version, cflags, .../) /(e.g., its version number)/
s/If not set it defaults to/The default is/

Do I need to resend a v4 patch with these modifications ? I am not sure
about the correct workflow here.

-- 
Rémi

Remi Pommarel wrote:

Do I need to resend a v4 patch with these modifications ? I am not sure
about the correct workflow here.

If you like the changes, you can ask Junio to squash them in.

If you don't like them, that's also fine and you can just say so.

On Mon, Oct 05, 2015 at 02:11:07PM -0700, Jonathan Nieder wrote:

Remi Pommarel wrote:

quoted

Do I need to resend a v4 patch with these modifications ? I am not sure
about the correct workflow here.

If you like the changes, you can ask Junio to squash them in.

If you don't like them, that's also fine and you can just say so.

These modifications are very fine with me and can be squash in.

Thanks a lot.