From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 6 Jun 2008 20:48:57 +0000 (+0000)
Subject: Update from head.
X-Git-Tag: OpenSSL_0_9_8i~48
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4681147bb3e92374bcea7dd2137ad54bf1f693b3;p=oweals%2Fopenssl.git

Update from head.
---

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 0b01fd62f5..1e254119e6 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -139,7 +139,6 @@ if ($FLAVOR =~ /CE/)
 else
 	{
 	$ex_libs.=' gdi32.lib crypt32.lib advapi32.lib user32.lib';
-	$ex_libs.=' cryptui.lib' if $OPTIONS =~ /-DOPENSSL_CAPIENG_DIALOG/;
 	$ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
 	}
 
@@ -277,10 +276,6 @@ sub do_lib_rule
 			if ($target =~ /capi/)
 				{
 				$ex.=' crypt32.lib advapi32.lib';
-				if ($cflags =~ /-DOPENSSL_CAPIENG_DIALOG/)
-					{
-					$ex.=' cryptui.lib';
-					}
 				}
 			}
 		elsif ($FLAVOR =~ /CE/)
@@ -292,7 +287,6 @@ sub do_lib_rule
 			$ex.=' unicows.lib' if ($FLAVOR =~ /NT/);
 			$ex.=' wsock32.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/;