From 2762e5555ca3c850c76b70d5b174de6937e2a866 Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Tue, 7 Apr 2009 19:35:57 +0000
Subject: [PATCH] Support Perl 5.10 and TCL 8.5 in MSVC builds.

We should probably have a better way to do this (meaning
something not hardcoded) eventually, but this fixes the
problem for 8.4.

Dave Page
---
 src/tools/msvc/Mkvcbuild.pm | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 50a931fec1..6b1106288d 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -3,7 +3,7 @@ package Mkvcbuild;
 #
 # Package that generates build files for msvc build
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.38 2009/03/08 19:13:38 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.39 2009/04/07 19:35:57 mha Exp $
 #
 use Carp;
 use Win32;
@@ -104,7 +104,14 @@ sub mkvcbuild
             }
         }
         $plperl->AddReference($postgres);
-        $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');
+        if (-e $solution->{options}->{perl} . '\lib\CORE\perl510.lib')
+        {
+            $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl510.lib');
+        }
+        else
+        {
+            $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');
+        }
     }
 
     if ($solution->{options}->{python})
@@ -122,7 +129,14 @@ sub mkvcbuild
         my $pltcl = $solution->AddProject('pltcl','dll','PLs','src\pl\tcl');
         $pltcl->AddIncludeDir($solution->{options}->{tcl} . '\include');
         $pltcl->AddReference($postgres);
-        $pltcl->AddLibrary($solution->{options}->{tcl} . '\lib\tcl84.lib');
+        if (-e $solution->{options}->{tcl} . '\lib\tcl85.lib')
+        {
+            $pltcl->AddLibrary($solution->{options}->{tcl} . '\lib\tcl85.lib');
+        }
+        else
+        {
+            $pltcl->AddLibrary($solution->{options}->{tcl} . '\lib\tcl84.lib');
+        }
     }
 
     $libpq = $solution->AddProject('libpq','dll','interfaces','src\interfaces\libpq');
-- 
2.11.0