From 5d34bd939a1887e13a8321e91bc4c626c09d0c11 Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Fri, 7 Oct 2005 09:47:36 +0000
Subject: [PATCH] Add Kerberos support. Update paths to use libpq from
 PostgreSQL 8.1 by default.

---
 installer/psqlodbcm.wxs | 14 +++++++++-----
 win32.mak               |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/installer/psqlodbcm.wxs b/installer/psqlodbcm.wxs
index f819794..753e120 100644
--- a/installer/psqlodbcm.wxs
+++ b/installer/psqlodbcm.wxs
@@ -24,15 +24,19 @@
           <!-- PostgreSQL -->
           <File Id="psqlodbca.dll" LongName="psqlodbca.dll" Name="psqlodxA.dll" src="../ANSI-Release/psqlodbca.dll" />
           <File Id="psqlodbcw.dll" LongName="psqlodbcw.dll" Name="psqlodxW.dll" src="../Unicode-Release/psqlodbcw.dll" />
-          <File Id="libpq.dll" Name="libpq.dll" src="C:\Windows\System32\libpq.dll" KeyPath="yes" />
+          <File Id="libpq.dll" Name="libpq.dll" src="C:\Program Files\PostgreSQL\8.1\bin\libpq.dll" KeyPath="yes" />
           
           <!-- Gettext -->
-          <File Id="libintl_2.dll" LongName="libintl-2.dll" Name="libintXX.dll" src="C:\Windows\System32\libintl-2.dll" />
-          <File Id="libiconv_2.dll" LongName="libiconv-2.dll" Name="libicoXX.dll" src="C:\Windows\System32\libiconv-2.dll" />
+          <File Id="libintl_2.dll" LongName="libintl-2.dll" Name="libintXX.dll" src="C:\Program Files\PostgreSQL\8.1\bin\libintl-2.dll" />
+          <File Id="libiconv_2.dll" LongName="libiconv-2.dll" Name="libicoXX.dll" src="C:\Program Files\PostgreSQL\8.1\bin\libiconv-2.dll" />
           
           <!-- SSL -->
-          <File Id="libeay32.dll" Name="libeay32.dll" src="C:\Windows\System32\libeay32.dll" />
-          <File Id="ssleay32.dll" Name="ssleay32.dll" src="C:\Windows\System32\ssleay32.dll" />
+          <File Id="libeay32.dll" Name="libeay32.dll" src="C:\Program Files\PostgreSQL\8.1\bin\libeay32.dll" />
+          <File Id="ssleay32.dll" Name="ssleay32.dll" src="C:\Program Files\PostgreSQL\8.1\bin\ssleay32.dll" />
+ 
+          <!-- MIT Kerberos -->
+          <File Id="comerr32.dll" Name="comerr32.dll" src="C:\Program Files\PostgreSQL\8.1\bin\comerr32.dll" />
+          <File Id="krb5_32.dll" Name="krb5_32.dll" src="C:\Program Files\PostgreSQL\8.1\bin\krb5_32.dll" />
           
           <!-- Note, installing the driver properly (IE, using ODBCDriver) has proven unreliable -->
           <!--       so we install the registry keys manually ourselves.                         -->
diff --git a/win32.mak b/win32.mak
index 6c873c1..f13a8bc 100644
--- a/win32.mak
+++ b/win32.mak
@@ -22,12 +22,12 @@ CFG=Release
 !ENDIF 
 
 !IF "$(PG_INC)" == ""
-PG_INC=C:\Program Files\PostgreSQL\8.0\include
+PG_INC=C:\Program Files\PostgreSQL\8.1\include
 !MESSAGE Using default PostgreSQL Include directory: $(PG_INC)
 !ENDIF 
 
 !IF "$(PG_LIB)" == ""
-PG_LIB=C:\Program Files\PostgreSQL\8.0\lib\ms
+PG_LIB=C:\Program Files\PostgreSQL\8.1\lib\ms
 !MESSAGE Using default PostgreSQL Library directory: $(PG_LIB)
 !ENDIF 
 
-- 
2.39.5