From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 31 Mar 2014 23:31:07 +0000 (-0700)
Subject: Merge branch 'mr/msvc-link-with-lcurl'
X-Git-Tag: v2.0.0-rc0~42
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8456113de56a1d1407703b1d4d8e789a54b987c9?hp=-c

Merge branch 'mr/msvc-link-with-lcurl'

* mr/msvc-link-with-lcurl:
MSVC: allow linking with the cURL library
---

8456113de56a1d1407703b1d4d8e789a54b987c9
diff --combined config.mak.uname
index 6069a44350,f1690d6a79..cfc2a9323f
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -108,6 -108,7 +108,6 @@@ ifeq ($(uname_S),SunOS
  	NO_MKDTEMP = YesPlease
  	NO_MKSTEMPS = YesPlease
  	NO_REGEX = YesPlease
 -	NO_FNMATCH_CASEFOLD = YesPlease
  	NO_MSGFMT_EXTENDED_OPTIONS = YesPlease
  	HAVE_DEV_TTY = YesPlease
  	ifeq ($(uname_R),5.6)
@@@ -258,6 -259,7 +258,6 @@@ ifeq ($(uname_S),IRIX
  	# issue, comment out the NO_MMAP statement.
  	NO_MMAP = YesPlease
  	NO_REGEX = YesPlease
 -	NO_FNMATCH_CASEFOLD = YesPlease
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	SHELL_PATH = /usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease
@@@ -277,6 -279,7 +277,6 @@@ ifeq ($(uname_S),IRIX64
  	# issue, comment out the NO_MMAP statement.
  	NO_MMAP = YesPlease
  	NO_REGEX = YesPlease
 -	NO_FNMATCH_CASEFOLD = YesPlease
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	SHELL_PATH = /usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease
@@@ -293,6 -296,7 +293,6 @@@ ifeq ($(uname_S),HP-UX
  	NO_UNSETENV = YesPlease
  	NO_HSTRERROR = YesPlease
  	NO_SYS_SELECT_H = YesPlease
 -	NO_FNMATCH_CASEFOLD = YesPlease
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	NO_NSEC = YesPlease
  	ifeq ($(uname_R),B.11.00)
@@@ -323,6 -327,7 +323,6 @@@ ifeq ($(uname_S),Windows
  	NO_UNSETENV = YesPlease
  	NO_STRCASESTR = YesPlease
  	NO_STRLCPY = YesPlease
 -	NO_FNMATCH = YesPlease
  	NO_MEMMEM = YesPlease
  	# NEEDS_LIBICONV = YesPlease
  	NO_ICONV = YesPlease
@@@ -340,7 -345,6 +340,6 @@@
  	UNRELIABLE_FSTAT = UnfortunatelyYes
  	OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
  	NO_REGEX = YesPlease
- 	NO_CURL = YesPlease
  	NO_GETTEXT = YesPlease
  	NO_PYTHON = YesPlease
  	BLK_SHA1 = YesPlease
@@@ -384,11 -388,13 +383,11 @@@ ifeq ($(uname_S),Interix
  		NO_INET_NTOP = YesPlease
  		NO_INET_PTON = YesPlease
  		NO_SOCKADDR_STORAGE = YesPlease
 -		NO_FNMATCH_CASEFOLD = YesPlease
  	endif
  	ifeq ($(uname_R),5.2)
  		NO_INET_NTOP = YesPlease
  		NO_INET_PTON = YesPlease
  		NO_SOCKADDR_STORAGE = YesPlease
 -		NO_FNMATCH_CASEFOLD = YesPlease
  	endif
  endif
  ifeq ($(uname_S),Minix)
@@@ -433,6 -439,7 +432,6 @@@ ifeq ($(uname_S),NONSTOP_KERNEL
  	NO_D_TYPE_IN_DIRENT = YesPlease
  	NO_HSTRERROR = YesPlease
  	NO_STRCASESTR = YesPlease
 -	NO_FNMATCH_CASEFOLD = YesPlease
  	NO_MEMMEM = YesPlease
  	NO_STRLCPY = YesPlease
  	NO_SETENV = YesPlease
@@@ -476,6 -483,7 +475,6 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	NO_UNSETENV = YesPlease
  	NO_STRCASESTR = YesPlease
  	NO_STRLCPY = YesPlease
 -	NO_FNMATCH = YesPlease
  	NO_MEMMEM = YesPlease
  	NEEDS_LIBICONV = YesPlease
  	NO_STRTOUMAX = YesPlease
@@@ -529,6 -537,7 +528,6 @@@ ifeq ($(uname_S),QNX
  	EXPAT_NEEDS_XMLPARSE_H = YesPlease
  	HAVE_STRINGS_H = YesPlease
  	NEEDS_SOCKET = YesPlease
 -	NO_FNMATCH_CASEFOLD = YesPlease
  	NO_GETPAGESIZE = YesPlease
  	NO_ICONV = YesPlease
  	NO_MEMMEM = YesPlease