Update from stable branch.

diff --git a/CHANGES b/CHANGES
index c3a784893009592851e0c21dca1f10f37308b90e..4ad548107254167607c5858f1ba60d5cdf0607ee 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -117,6 +117,9 @@
 
  Changes between 0.9.8a and 0.9.8b  [XX xxx XXXX]
 
+  *) Link in manifests for VC++ if needed.
+     [Austin Ziegler <halostatue@gmail.com>]
+
   *) Update support for ECC-based TLS ciphersuites according to
      draft-ietf-tls-ecc-12.txt with proposed changes.
      [Douglas Stebila]

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 94a1e83011263f6e67b0a09bf6bff44ae57d6ff3..f24b9f62f0a6a523b4d00abccfb9e028166eb896 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -285,6 +285,7 @@ sub do_lib_rule
                        }
                $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
                $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
+        $ret.="\tIF EXIST \$@.manifest mt -manifest \$@.manifest -outputresource:\$@;2\n\n";
                }
        $ret.="\n";
        return($ret);
@@ -298,8 +299,9 @@ sub do_link_rule
        $file =~ s/\//$o/g if $o ne '/';
        $n=&bname($targer);
        $ret.="$target: $files $dep_libs\n";
-       $ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n";
-       $ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n\n";
+       $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n";
+       $ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n";
+    $ret.="\tIF EXIST \$@.manifest mt -manifest \$@.manifest -outputresource:\$@;1\n\n";
        return($ret);
        }