Support -L options in VC++ link.

diff --git a/demos/pkcs12/pkread.c b/demos/pkcs12/pkread.c
index 02e16cda2af5d281ef82a1b03ae086be30e93dba..bc193600bfebf470fca62d4ccb8f5a9e1966c88a 100644 (file)
--- 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 ac1959acb361fbfefc5f273dd4a8906a2b331247..45013475dac15ffbd3a483adf8ce7234d2b3fa8a 100644 (file)
--- 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/)