From d5067112db68fcc8c7b13c769c896b17480cb5b0 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Tue, 15 Apr 2014 03:40:31 -0700 Subject: [PATCH] Makefile: allow static linking against libcurl 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 Signed-off-by: Junio C Hamano --- Makefile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d6330bc675..e4c93f68ec 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,9 @@ all:: # Define CURL_CONFIG to the path to a curl-config binary other than the # default 'curl-config'. # +# 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. @@ -1139,9 +1142,16 @@ else else CURL_CONFIG ?= curl-config BASIC_CFLAGS += $(shell $(CURL_CONFIG) --cflags) - CURL_LIBCURL = $(shell $(CURL_CONFIG) --libs) - ifeq "$(CURL_LIBCURL)" "" - $(error curl not detected; try setting CURLDIR) + ifdef CURL_STATIC + CURL_LIBCURL = $(shell $(CURL_CONFIG) --static-libs) + ifeq "$(CURL_LIBCURL)" "" + $(error libcurl not detected or not compiled with static support) + endif + else + CURL_LIBCURL = $(shell $(CURL_CONFIG) --libs) + ifeq "$(CURL_LIBCURL)" "" + $(error libcurl not detected; try setting CURLDIR) + endif endif endif -- 2.11.4.GIT