From 9362f3e8e103b923a13419a5eeaa2fea8e71059d Mon Sep 17 00:00:00 2001
From: Hiroshi Saito <hiroshi@winpg.jp>
Date: Sat, 3 May 2008 18:52:06 +0000
Subject: [PATCH] Adjustment of a library. (PostgreSQL Version 8.3 of MSVC)

---
 installer/Make.bat      | 4 ++--
 installer/psqlodbc.wxs  | 7 +++++++
 installer/psqlodbcm.wxs | 4 +++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/installer/Make.bat b/installer/Make.bat
index c718688..999c454 100644
--- a/installer/Make.bat
+++ b/installer/Make.bat
@@ -20,7 +20,7 @@ echo.
 echo.
 echo Building psqlODBC merge module...
 
-candle -nologo -dVERSION=%VERSION% -dSUBLOC=%SUBLOC% -dPROGRAMFILES="%ProgramFiles%" psqlodbcm.wxs
+candle -nologo -dVERSION=%VERSION% -dSUBLOC=%SUBLOC% -dPROGRAMFILES="%ProgramFiles%" -dSYSTEM32DIR="%SystemRoot%/system32" psqlodbcm.wxs
 IF ERRORLEVEL 1 GOTO ERR_HANDLER
 
 light -nologo -out psqlodbc.msm psqlodbcm.wixobj
@@ -29,7 +29,7 @@ IF ERRORLEVEL 1 GOTO ERR_HANDLER
 echo.
 echo Building psqlODBC installer database...
 
-candle -nologo -dVERSION=%VERSION% -dSUBLOC=%SUBLOC% -dPROGRAMFILES="%ProgramFiles%" psqlodbc.wxs
+candle -nologo -dVERSION=%VERSION% -dSUBLOC=%SUBLOC% -dPROGRAMFILES="%ProgramFiles%" -dPROGRAMCOM="%ProgramFiles%/Common Files/Merge Modules" psqlodbc.wxs
 IF ERRORLEVEL 1 GOTO ERR_HANDLER
 
 light -nologo -ext WixUIExtension -cultures:en-us psqlodbc.wixobj
diff --git a/installer/psqlodbc.wxs b/installer/psqlodbc.wxs
index 915f189..a392cdb 100644
--- a/installer/psqlodbc.wxs
+++ b/installer/psqlodbc.wxs
@@ -25,6 +25,11 @@
 <!-- Directories -->
 
     <Directory Id="TARGETDIR" Name="SourceDir">
+
+       <!-- Shared assembly runtime for VS 2005 -->
+       <Merge Id="msvcr80dll" Language="0" DiskId="1" SourceFile="$(var.PROGRAMCOM)/Microsoft_VC80_CRT_x86.msm"/>
+       <Merge Id="msvcr80policy" Language="0" DiskId="1" SourceFile="$(var.PROGRAMCOM)/policy_8_0_Microsoft_VC80_CRT_x86.msm"/>
+
       <Directory Id="ProgramFilesFolder" Name="PFiles">
         <Directory Id="BASEDIR" Name="psqlODBC">
           <Directory Id="SUBLOC" Name="$(var.SUBLOC)">
@@ -73,6 +78,8 @@
       <Feature Id="binaries" Title="ODBC Driver" Level="1" Description="The ODBC driver and supporting libraries.">
         <ComponentRef Id="registration" />
         <MergeRef Id="psqlodbcm" />
+        <MergeRef Id="msvcr80dll" />
+        <MergeRef Id="msvcr80policy" />
       </Feature>
 
       <Feature Id="docs" Title="Documentation" Level="4" Description="Documentation, FAQs and HOWTOs.">
diff --git a/installer/psqlodbcm.wxs b/installer/psqlodbcm.wxs
index 41a012a..5b61386 100644
--- a/installer/psqlodbcm.wxs
+++ b/installer/psqlodbcm.wxs
@@ -18,7 +18,6 @@
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="BINDIR" Name=".">
         <Component Id="psqlodbc.files" Guid="00A1ACE3-B7C2-41b8-A1F1-DB565990DA4E">
-
           <!-- PostgreSQL -->
           <File Id="psqlodbc30a.dll" Name="psqlodbc30a.dll" Source="../MultibyteRelease/psqlodbc30a.dll" />
           <File Id="psqlodbc35w.dll" Name="psqlodbc35w.dll" Source="../Release/psqlodbc35w.dll" />
@@ -41,6 +40,9 @@
           <File Id="k5sprt32.dll" Name="k5sprt32.dll" Source="$(var.PROGRAMFILES)\PostgreSQL\8.3\bin\k5sprt32.dll" />
           <File Id="gssapi32.dll" Name="gssapi32.dll" Source="$(var.PROGRAMFILES)\PostgreSQL\8.3\bin\gssapi32.dll" />
 
+          <!-- VC++ 7.1 runtime - required by Kerberos -->
+          <File Id="msvcr71.dll" Name="msvcr71.dll" Source="$(var.SYSTEM32DIR)\msvcr71.dll" />
+
           <!-- Note, installing the driver properly (IE, using ODBCDriver) has proven unreliable -->
           <!--       so we install the registry keys manually ourselves.                         -->
           <RegistryValue Id="psqlodbc30a.reg.1" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" Name="PostgreSQL ANSI" Type="string" Value="Installed" />
-- 
2.39.5