Link in extra CryptoAPI related libraries if needed.
authorDr. Stephen Henson <steve@openssl.org>
Thu, 5 Jun 2008 10:51:48 +0000 (10:51 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 5 Jun 2008 10:51:48 +0000 (10:51 +0000)
util/pl/VC-32.pl

index 58b5128..cd9dbd4 100644 (file)
@@ -155,6 +155,7 @@ if ($FLAVOR =~ /CE/)
 else
        {
        $ex_libs.=' gdi32.lib advapi32.lib crypt32.lib user32.lib';
+       $ex_libs.=' cryptui.lib' if $cflags =~ /-DOPENSSL_CAPIENG_DIALOG/;
        $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
        # WIN32 UNICODE build gets linked with unicows.lib for
        # backward compatibility with Win9x.
@@ -291,7 +292,14 @@ sub do_lib_rule
                if ($name eq "")
                        {
                        $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
-                       $ex.=' crypt32.lib advapi32.lib' if ($target =~ /capi/);
+                       if ($target =~ /capi/)
+                               {
+                               $ex.=' crypt32.lib advapi32.lib';
+                               if ($cflags =~ /-DOPENSSL_CAPIENG_DIALOG/)
+                                       {
+                                       $ex.=' cryptui.lib';
+                                       }
+                               }
                        }
                elsif ($FLAVOR =~ /CE/)
                        {
@@ -304,6 +312,7 @@ sub do_lib_rule
                        $ex.=' unicows.lib' if ($FLAVOR =~ /NT/);
                        $ex.=' ws2_32.lib gdi32.lib advapi32.lib user32.lib';
                        $ex.=' crypt32.lib';
+                       $ex.=' cryptui.lib' if $cflags =~ /-DOPENSSL_CAPIENG_DIALOG/;
                        $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
                        }
                $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;