undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: allow static linking against libcurl

Browse Source 
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@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Dave Borowitz 2014-04-15 03:40:31 -07:00 committed by Junio C Hamano
parent 61a64fff4f
commit d5067112db
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -37,6 +37,9 @@ all::
# Define CURL_CONFIG to the path to a curl-config binary other than the # Define CURL_CONFIG to the path to a curl-config binary other than the
# default 'curl-config'. # 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 # 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, # /foo/bar/include and /foo/bar/lib directories. This overrides CURL_CONFIG,
# but is less robust. # but is less robust.
@ -1139,9 +1142,16 @@ else
else else
CURL_CONFIG ?= curl-config CURL_CONFIG ?= curl-config
BASIC_CFLAGS += $(shell $(CURL_CONFIG) --cflags) BASIC_CFLAGS += $(shell $(CURL_CONFIG) --cflags)
CURL_LIBCURL = $(shell $(CURL_CONFIG) --libs) ifdef CURL_STATIC
ifeq "$(CURL_LIBCURL)" "" CURL_LIBCURL = $(shell $(CURL_CONFIG) --static-libs)
$(error curl not detected; try setting CURLDIR) 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
endif endif