Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 28, 2014, 20:45 UTC
- Message-ID
- <xmqqlhupp4hx.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1398714653-1050-1-git-send-email-dborowitz@google.com>
Dave Borowitz <dborowitz@google.com> writes:
Show 10 quoted lines
> 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 curl-config is always installed was incorrect. > > 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. > ---
Sign-off?
I still think the implementation of "If CURL_CONFIG is unset" bit is a bit redundant, though.
Show 6 quoted lines
> + CURL_CONFIG ?= curl-config > + ifeq "$(CURL_CONFIG)" "" > + CURL_LIBCURL = > + else > + CURL_LIBCURL := $(shell $(CURL_CONFIG) --libs) > + endif
Other than that, the remainder of the change looks correct to me.
Thanks.