summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-30 10:58:10 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-30 11:00:15 -0700
commitb2feb643097a1ec0cbe79fc161f604b6265c049b (patch)
tree7a4f8a8d6bd003d5a60f47ffc9f39c2566f82cea /Makefile
parentd8779e1e2536bdd024254af14d2c046bba2bbb01 (diff)
downloadgit-b2feb643097a1ec0cbe79fc161f604b6265c049b.tar.gz
Revert the whole "ask curl-config" topic for now
Postpone this a bit during the feature freeze and retry the effort in the next cycle.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile64
1 files changed, 14 insertions, 50 deletions
diff --git a/Makefile b/Makefile
index 81e8214236..a53f3a8326 100644
--- a/Makefile
+++ b/Makefile
@@ -34,18 +34,8 @@ all::
# git-http-push are not built, and you cannot use http:// and https://
# transports (neither smart nor dumb).
#
-# Define CURL_CONFIG to the path to a curl-config binary other than the
-# default 'curl-config'. If CURL_CONFIG is unset or points to a binary that
-# is not found, defaults to the CURLDIR behavior.
-#
-# 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. If not set, and CURL_CONFIG is not set,
-# uses -lcurl with no additional library detection (other than
-# NEEDS_*_WITH_CURL).
+# /foo/bar/include and /foo/bar/lib directories.
#
# Define NO_EXPAT if you do not have expat installed. git-http-push is
# not built, and you cannot push using http:// and https:// transports (dumb).
@@ -153,11 +143,9 @@ all::
#
# Define NEEDS_SSL_WITH_CRYPTO if you need -lssl when using -lcrypto (Darwin).
#
-# Define NEEDS_SSL_WITH_CURL if you need -lssl with -lcurl (Minix). Only used
-# if CURLDIR is set.
+# Define NEEDS_SSL_WITH_CURL if you need -lssl with -lcurl (Minix).
#
-# Define NEEDS_IDN_WITH_CURL if you need -lidn when using -lcurl (Minix). Only
-# used if CURLDIR is set.
+# Define NEEDS_IDN_WITH_CURL if you need -lidn when using -lcurl (Minix).
#
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
#
@@ -1130,45 +1118,21 @@ ifdef NO_CURL
REMOTE_CURL_NAMES =
else
ifdef CURLDIR
- CURL_LIBCURL =
+ # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
+ BASIC_CFLAGS += -I$(CURLDIR)/include
+ CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
else
- CURL_CONFIG = curl-config
- ifeq "$(CURL_CONFIG)" ""
- CURL_LIBCURL =
- else
- CURL_LIBCURL := $(shell $(CURL_CONFIG) --libs)
- endif
+ CURL_LIBCURL = -lcurl
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
- CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
- else
- CURL_LIBCURL = -lcurl
- endif
- ifdef NEEDS_SSL_WITH_CURL
- CURL_LIBCURL += -lssl
- ifdef NEEDS_CRYPTO_WITH_SSL
- CURL_LIBCURL += -lcrypto
- endif
- endif
- ifdef NEEDS_IDN_WITH_CURL
- CURL_LIBCURL += -lidn
- 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
+ ifdef NEEDS_SSL_WITH_CURL
+ CURL_LIBCURL += -lssl
+ ifdef NEEDS_CRYPTO_WITH_SSL
+ CURL_LIBCURL += -lcrypto
endif
endif
+ ifdef NEEDS_IDN_WITH_CURL
+ CURL_LIBCURL += -lidn
+ endif
REMOTE_CURL_PRIMARY = git-remote-http$X
REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X