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

* mr/msvc-link-with-lcurl: MSVC: allow linking with the cURL library
git-mirror · Mar 31, 2014 · 8456113 · 8456113
2 parents 24b9cb1 + da8daa3
commit 8456113
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
@@ -33,6 +33,8 @@
 		push(@args, "libeay32.lib");
 	} elsif ("$arg" eq "-lssl") {
 		push(@args, "ssleay32.lib");
+	} elsif ("$arg" eq "-lcurl") {
+		push(@args, "libcurl.lib");
 	} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
 		$arg =~ s/^-L/-LIBPATH:/;
 		push(@args, $arg);

diff --git 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