From: Dave Borowitz <dborowitz@google.com>
To: git@vger.kernel.org
Cc: Dave Borowitz <dborowitz@google.com>
Subject: [PATCH 2/2] Makefile: allow static linking against libcurl
Date: Sat, 12 Apr 2014 16:15:02 -0700 [thread overview]
Message-ID: <1397344502-23459-2-git-send-email-dborowitz@google.com> (raw)
In-Reply-To: <1397344502-23459-1-git-send-email-dborowitz@google.com>
Signed-off-by: Dave Borowitz <dborowitz@google.com>
---
Makefile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index d6330bc..3c151d3 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,7 +1142,11 @@ else
else
CURL_CONFIG ?= curl-config
BASIC_CFLAGS += $(shell $(CURL_CONFIG) --cflags)
- CURL_LIBCURL = $(shell $(CURL_CONFIG) --libs)
+ ifdef CURL_STATIC
+ CURL_LIBCURL = $(shell $(CURL_CONFIG) --static-libs)
+ else
+ CURL_LIBCURL = $(shell $(CURL_CONFIG) --libs)
+ endif
ifeq "$(CURL_LIBCURL)" ""
$(error curl not detected; try setting CURLDIR)
endif
--
1.9.1.423.g4596e3a
next prev parent reply other threads:[~2014-04-12 23:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-12 23:15 [PATCH 1/2] Makefile: use curl-config to determine curl flags Dave Borowitz
2014-04-12 23:15 ` Dave Borowitz [this message]
2014-04-14 20:22 ` Junio C Hamano
2014-04-15 10:20 ` Dave Borowitz
2014-04-15 16:50 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1397344502-23459-2-git-send-email-dborowitz@google.com \
--to=dborowitz@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.