This requires more flags than can be guessed with the old-style CURLDIR and related options, so is only supported when curl-config is present. Signed-off-by: Dave Borowitz <dborowitz@xxxxxxxxxx> --- Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Makefile b/Makefile index cb4ee37..360d427 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,9 @@ all:: # is not found, defaults to the CURLDIR behavior, or if CURLDIR is not set, # uses -lcurl with no additional library detection. # +# Define CURL_STATIC to statically link libcurl. Only applies if +# CURL_CONFIG is used. +# # Define CURLDIR=/foo/bar if your curl header and library files are in # /foo/bar/include and /foo/bar/lib directories. This overrides CURL_CONFIG, # but is less robust. @@ -1137,6 +1140,9 @@ else endif ifeq "$(CURL_LIBCURL)" "" + ifdef CURL_STATIC + $(error "CURL_STATIC must be used with CURL_CONFIG") + endif ifdef CURLDIR # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case. BASIC_CFLAGS += -I$(CURLDIR)/include @@ -1155,6 +1161,12 @@ else endif else BASIC_CFLAGS += $(shell $(CURL_CONFIG) --cflags) + ifdef CURL_STATIC + CURL_LIBCURL = $(shell $(CURL_CONFIG) --static-libs) + ifeq "$(CURL_LIBCURL)" "" + $(error libcurl not detected or not compiled with static support) + endif + endif endif REMOTE_CURL_PRIMARY = git-remote-http$X -- 1.9.1.423.g4596e3a -- 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