[PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

2014-04-28 Thread Dave Borowitz
The original implementation of CURL_CONFIG support did not match the original behavior of using -lcurl when CURLDIR was not set. This broke implementations that were lacking curl-config but did have libcurl installed along system libraries, such as MSysGit. In other words, the assumption that

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

2014-04-28 Thread Dave Borowitz
On Mon, Apr 28, 2014 at 1:46 PM, Dave Borowitz dborow...@google.com wrote: How about: If CURL_CONFIG is unset or points to a binary that is not found, defaults to the CURLDIR behavior. If CURLDIR is not set, this means using -lcurl with no additional library detection (other than

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

2014-04-28 Thread Jonathan Nieder
Dave Borowitz wrote: On Mon, Apr 28, 2014 at 1:05 PM, Jonathan Nieder jrnie...@gmail.com wrote: Dave Borowitz wrote: +++ b/Makefile @@ -35,7 +35,9 @@ all:: # transports (neither smart nor dumb). # # Define CURL_CONFIG to the path to a curl-config binary other than the -# default

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

2014-04-28 Thread Dave Borowitz
On Mon, Apr 28, 2014 at 1:50 PM, Jonathan Nieder jrnie...@gmail.com wrote: $ echo -e 'ifndef FOO\n\t$(error bad things)\nendif\n\nfoo:\n\ttouch foo' mk1 make -f mk1 foo mk1:2: *** commands commence before first target. Stop. $ echo -e 'ifndef FOO\n $(error bad

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

2014-04-28 Thread Dave Borowitz
On Mon, Apr 28, 2014 at 1:05 PM, Jonathan Nieder jrnie...@gmail.com wrote: Dave Borowitz wrote: Instead, if CURL_CONFIG is empty or returns an empty result (e.g. due to curl-config being missing), use the old behavior of falling back to -lcurl. --- Makefile | 36

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

2014-04-28 Thread Dave Borowitz
On Mon, Apr 28, 2014 at 1:45 PM, Junio C Hamano gits...@pobox.com wrote: I still think the implementation of If CURL_CONFIG is unset bit is a bit redundant, though. If CURL_CONFIG is unset, then $(shell $(CURL_CONFIG) --libs) produces make: --libs: Command not found, which may be confusing. --

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

2014-04-28 Thread Junio C Hamano
Dave Borowitz dborow...@google.com writes: On Mon, Apr 28, 2014 at 1:05 PM, Jonathan Nieder jrnie...@gmail.com wrote: Dave Borowitz wrote: Instead, if CURL_CONFIG is empty or returns an empty result (e.g. due to curl-config being missing), use the old behavior of falling back to -lcurl.

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

2014-04-28 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Gah. Maybe it should be left-justified to avoid accentally breaking it again. ;-). Yes, $(error) is not the usual part of to build this target, follow this recipe part. But let's take the last round as-is and go with it for 2.0. Tahnks. -- To