From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 20 Jan 2010 14:04:55 +0000 (+0000)
Subject: Support -L options in VC++ link.
X-Git-Tag: OpenSSL_1_0_0-beta5~3
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=9359fc5ff2c10dae70b7d9303e99312a7c4471d9

Support -L options in VC++ link.
---

diff --git a/demos/pkcs12/pkread.c b/demos/pkcs12/pkread.c
index 02e16cda2a..bc193600bf 100644
--- a/demos/pkcs12/pkread.c
+++ b/demos/pkcs12/pkread.c
@@ -20,7 +20,8 @@ int main(int argc, char **argv)
 		fprintf(stderr, "Usage: pkread p12file password opfile\n");
 		exit (1);
 	}
-	SSLeay_add_all_algorithms();
+	/*SSLeay_add_all_algorithms();*/
+	SSL_library_init();
 	ERR_load_crypto_strings();
 	if (!(fp = fopen(argv[1], "rb"))) {
 		fprintf(stderr, "Error opening file %s\n", argv[1]);
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index ac1959acb3..45013475da 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -13,6 +13,10 @@ $rm='del /Q';
 
 $zlib_lib="zlib1.lib";
 
+# Santize -L options for ms link
+$l_flags =~ s/-L("\[^"]+")/\/libpath:$1/g;
+$l_flags =~ s/-L(\S+)/\/libpath:$1/g;
+
 # C compiler stuff
 $cc='cl';
 if ($FLAVOR =~ /WIN64/)