summaryrefslogtreecommitdiff
path: root/config.mak.uname
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-31 16:31:07 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-31 16:31:07 -0700
commit8456113de56a1d1407703b1d4d8e789a54b987c9 (patch)
treebf6c06a82a62d420c1ad1d0ab2c0b5dc8888a07b /config.mak.uname
parent24b9cb100214adb0c5ebe574924c3acf6c61f214 (diff)
parentda8daa367b7dfe4337252810f6be0c0c31aa93c2 (diff)
downloadgit-8456113de56a1d1407703b1d4d8e789a54b987c9.tar.gz
Merge branch 'mr/msvc-link-with-lcurl'
* mr/msvc-link-with-lcurl: MSVC: allow linking with the cURL library
Diffstat (limited to 'config.mak.uname')
-rw-r--r--config.mak.uname1
1 files changed, 0 insertions, 1 deletions
diff --git a/config.mak.uname b/config.mak.uname
index 6069a44350..cfc2a9323f 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -340,7 +340,6 @@ ifeq ($(uname_S),Windows)
UNRELIABLE_FSTAT = UnfortunatelyYes
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
NO_REGEX = YesPlease
- NO_CURL = YesPlease
NO_GETTEXT = YesPlease
NO_PYTHON = YesPlease
BLK_SHA1 = YesPlease