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.
Junio C Hamano committed
Apr 30, 2014 at 10:58 UTC
b2feb643097a1ec0cbe79fc161f604b6265c049b
1 file changed
+14
-50
Makefile
+14
-50
@@ -34,18 +34,8 @@ all::
34
# git-http-push are not built, and you cannot use http:// and https://
35
# transports (neither smart nor dumb).
36
#
37
-# Define CURL_CONFIG to the path to a curl-config binary other than the
38
-# default 'curl-config'. If CURL_CONFIG is unset or points to a binary that
39
-# is not found, defaults to the CURLDIR behavior.
40
-#
41
-# Define CURL_STATIC to statically link libcurl. Only applies if
42
-# CURL_CONFIG is used.
43
-#
37
# Define CURLDIR=/foo/bar if your curl header and library files are in
45
-# /foo/bar/include and /foo/bar/lib directories. This overrides
46
-# CURL_CONFIG, but is less robust. If not set, and CURL_CONFIG is not set,
47
-# uses -lcurl with no additional library detection (other than
48
-# NEEDS_*_WITH_CURL).
38
+# /foo/bar/include and /foo/bar/lib directories.
39
#
40
# Define NO_EXPAT if you do not have expat installed. git-http-push is
41
# not built, and you cannot push using http:// and https:// transports (dumb).
@@ -153,11 +143,9 @@ all::
143
#
144
# Define NEEDS_SSL_WITH_CRYPTO if you need -lssl when using -lcrypto (Darwin).
145
#
156
-# Define NEEDS_SSL_WITH_CURL if you need -lssl with -lcurl (Minix). Only used
157
-# if CURLDIR is set.
146
+# Define NEEDS_SSL_WITH_CURL if you need -lssl with -lcurl (Minix).
147
#
159
-# Define NEEDS_IDN_WITH_CURL if you need -lidn when using -lcurl (Minix). Only
160
-# used if CURLDIR is set.
148
+# Define NEEDS_IDN_WITH_CURL if you need -lidn when using -lcurl (Minix).
149
#
150
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
151
#
@@ -1130,45 +1118,21 @@ ifdef NO_CURL
1118
REMOTE_CURL_NAMES =
1119
else
1120
ifdef CURLDIR
1133
- CURL_LIBCURL =
1121
+ # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
1122
+ BASIC_CFLAGS += -I$(CURLDIR)/include
1123
+ CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
1124
else
1135
- CURL_CONFIG = curl-config
1136
- ifeq "$(CURL_CONFIG)" ""
1137
- CURL_LIBCURL =
1138
- else
1139
- CURL_LIBCURL := $(shell $(CURL_CONFIG) --libs)
1140
- endif
1125
+ CURL_LIBCURL = -lcurl
1126
endif
1142
-
1143
- ifeq "$(CURL_LIBCURL)" ""
1144
- ifdef CURL_STATIC
1145
-$(error "CURL_STATIC must be used with CURL_CONFIG")
1146
- endif
1147
- ifdef CURLDIR
1148
- # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
1149
- BASIC_CFLAGS += -I$(CURLDIR)/include
1150
- CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
1151
- else
1152
- CURL_LIBCURL = -lcurl
1153
- endif
1154
- ifdef NEEDS_SSL_WITH_CURL
1155
- CURL_LIBCURL += -lssl
1156
- ifdef NEEDS_CRYPTO_WITH_SSL
1157
- CURL_LIBCURL += -lcrypto
1158
- endif
1159
- endif
1160
- ifdef NEEDS_IDN_WITH_CURL
1161
- CURL_LIBCURL += -lidn
1162
- endif
1163
- else
1164
- BASIC_CFLAGS += $(shell $(CURL_CONFIG) --cflags)
1165
- ifdef CURL_STATIC
1166
- CURL_LIBCURL = $(shell $(CURL_CONFIG) --static-libs)
1167
- ifeq "$(CURL_LIBCURL)" ""
1168
-$(error libcurl not detected or not compiled with static support)
1169
- endif
1127
+ ifdef NEEDS_SSL_WITH_CURL
1128
+ CURL_LIBCURL += -lssl
1129
+ ifdef NEEDS_CRYPTO_WITH_SSL
1130
+ CURL_LIBCURL += -lcrypto
1131
endif
1132
endif
1133
+ ifdef NEEDS_IDN_WITH_CURL
1134
+ CURL_LIBCURL += -lidn
1135
+ endif
1136
1137
REMOTE_CURL_PRIMARY = git-remote-http$X
1138
REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X