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

Revert the whole "ask curl-config" topic for now

Browse Source 
Postpone this a bit during the feature freeze and retry the effort
in the next cycle.
This commit is contained in:
Junio C Hamano 2014-04-30 10:58:10 -07:00
parent d8779e1e25
commit b2feb64309
1 changed files with 14 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Makefile
View File

@ -34,18 +34,8 @@ all::
# git-http-push are not built, and you cannot use http:// and https:// # git-http-push are not built, and you cannot use http:// and https://
# transports (neither smart nor dumb). # 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 # Define CURLDIR=/foo/bar if your curl header and library files are in
# /foo/bar/include and /foo/bar/lib directories. This overrides # /foo/bar/include and /foo/bar/lib directories.
# 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).
# #
# Define NO_EXPAT if you do not have expat installed. git-http-push is # 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). # 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_CRYPTO if you need -lssl when using -lcrypto (Darwin).
# #
# Define NEEDS_SSL_WITH_CURL if you need -lssl with -lcurl (Minix). Only used # Define NEEDS_SSL_WITH_CURL if you need -lssl with -lcurl (Minix).
# if CURLDIR is set.
# #
# Define NEEDS_IDN_WITH_CURL if you need -lidn when using -lcurl (Minix). Only # Define NEEDS_IDN_WITH_CURL if you need -lidn when using -lcurl (Minix).
# used if CURLDIR is set.
# #
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin). # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
# #
@ -1130,44 +1118,20 @@ ifdef NO_CURL
REMOTE_CURL_NAMES = REMOTE_CURL_NAMES =
else else
ifdef CURLDIR 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 else
CURL_CONFIG = curl-config CURL_LIBCURL = -lcurl
ifeq "$(CURL_CONFIG)" "" endif
CURL_LIBCURL = ifdef NEEDS_SSL_WITH_CURL
else CURL_LIBCURL += -lssl
CURL_LIBCURL := $(shell $(CURL_CONFIG) --libs) ifdef NEEDS_CRYPTO_WITH_SSL
CURL_LIBCURL += -lcrypto
endif endif
endif endif
ifdef NEEDS_IDN_WITH_CURL
ifeq "$(CURL_LIBCURL)" "" CURL_LIBCURL += -lidn
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
endif
endif endif
REMOTE_CURL_PRIMARY = git-remote-http$X REMOTE_CURL_PRIMARY = git-remote-http$X