On Mon, Apr 28, 2014 at 1:05 PM, Jonathan Nieder <jrnieder@xxxxxxxxx> 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 +++++++++++++++++++++++++----------- >> 1 file changed, 25 insertions(+), 11 deletions(-) > > Sign-off? Oops. > [...] >> +++ 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 'curl-config'. >> +# default 'curl-config'. If CURL_CONFIG is unset or points to a binary that >> +# is not found, defaults to the CURLDIR behavior, or if CURLDIR is not set, >> +# uses -lcurl with no additional library detection. > > I'm having a little trouble parsing this but don't have any better > suggestion. 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 NEEDS_*_WITH_CURL). [...] >> - $(error libcurl not detected; try setting CURLDIR) >> + $(error libcurl not detected or not compiled with static support) > > Whitespace damage. Yes, but intentional, because Makefile parsing is weird. $ 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 things)\nendif\n\nfoo:\n\ttouch foo' > mk2 && make -f mk2 foo mk2:2: *** bad things. Stop. See also: http://stackoverflow.com/questions/4713663/gnu-make-yields-commands-commence-before-first-target-error > Except for the whitespace issues, > Reviewed-by: Jonathan Nieder <jrnieder@xxxxxxxxx> > > Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html