Makefile: add Minix configuration options.
Add a $(uname_S) case for Minix with the correct options. Minix's linker needs all libraries specified explicitly. Add NEEDS_SSL_WITH_CURL to add -lssl when using -lcurl. Add NEEDS_IDN_WITH_CURL to add -lidn when using -lcurl. When NEEDS_SSL_WITH_CURL is defined and NEEDS_CRYPTO_WITH_SSL is defined, add -lcrypt to CURL_LIBCURL. Change OPENSSL_LINK to OPENSSL_LIBSSL in the NEEDS_CRYPTO_WITH_SSL conditional in the libopenssl section. Libraries go in OPENSSL_LIBSSL, OPENSSL_LINK is for linker flags. Signed-off-by: Thomas Cort <tcort@minix3.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Cort committed
Jul 19, 2011 at 18:55 UTC
bc5f813af6ab6802662ba4992ccbc78171c38906
1 file changed
+29
-1
Makefile
+29
-1
@@ -115,6 +115,10 @@ all::
115
#
116
# Define NEEDS_SSL_WITH_CRYPTO if you need -lssl when using -lcrypto (Darwin).
117
#
118
+# Define NEEDS_SSL_WITH_CURL if you need -lssl with -lcurl (Minix).
119
+#
120
+# Define NEEDS_IDN_WITH_CURL if you need -lidn when using -lcurl (Minix).
121
+#
122
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
123
#
124
# Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
@@ -1149,6 +1153,20 @@ ifeq ($(uname_S),Interix)
1153
NO_FNMATCH_CASEFOLD = YesPlease
1154
endif
1155
endif
1156
+ifeq ($(uname_S),Minix)
1157
+ NO_IPV6 = YesPlease
1158
+ NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
1159
+ NO_NSEC = YesPlease
1160
+ NEEDS_LIBGEN =
1161
+ NEEDS_CRYPTO_WITH_SSL = YesPlease
1162
+ NEEDS_IDN_WITH_CURL = YesPlease
1163
+ NEEDS_SSL_WITH_CURL = YesPlease
1164
+ NEEDS_RESOLV =
1165
+ NO_HSTRERROR = YesPlease
1166
+ NO_MMAP = YesPlease
1167
+ NO_CURL =
1168
+ NO_EXPAT =
1169
+endif
1170
ifneq (,$(findstring MINGW,$(uname_S)))
1171
pathsep = ;
1172
NO_PREAD = YesPlease
@@ -1293,6 +1311,16 @@ else
1311
else
1312
CURL_LIBCURL = -lcurl
1313
endif
1314
+ ifdef NEEDS_SSL_WITH_CURL
1315
+ CURL_LIBCURL += -lssl
1316
+ ifdef NEEDS_CRYPTO_WITH_SSL
1317
+ CURL_LIBCURL += -lcrypto
1318
+ endif
1319
+ endif
1320
+ ifdef NEEDS_IDN_WITH_CURL
1321
+ CURL_LIBCURL += -lidn
1322
+ endif
1323
+
1324
REMOTE_CURL_PRIMARY = git-remote-http$X
1325
REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X
1326
REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)
@@ -1329,7 +1357,7 @@ ifndef NO_OPENSSL
1357
OPENSSL_LINK =
1358
endif
1359
ifdef NEEDS_CRYPTO_WITH_SSL
1332
- OPENSSL_LINK += -lcrypto
1360
+ OPENSSL_LIBSSL += -lcrypto
1361
endif
1362
else
1363
BASIC_CFLAGS += -DNO_OPENSSL