Back out old unixodbc patches and apply new ones. Nick Gorham

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2ffb74d081cddd04caae2106ab19ba130f1d2547..35c7464169d0e7958b574bf53aa009e9ed8006f1 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Attic/GNUmakefile.in,v 1.13 2000/06/06 22:01:09 petere Exp $
+#    $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Attic/GNUmakefile.in,v 1.14 2000/06/12 17:58:20 momjian Exp $
 #
 #-------------------------------------------------------------------------
 @SET_MAKE@
@@ -38,12 +38,11 @@ OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \
         gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX)
 
 SHLIB_LINK= $(LD_FLAGS)
+SHLIB_LINK+= $(SHLIB_ODBC)
 
 # Shared library stuff, also default 'all' target
 include $(SRCDIR)/Makefile.shlib
 
-LDFLAGS_SL+= $(LDFLAGS_ODBC)
-
 .PHONY: install install-ini beforeinstall-headers install-headers
 
 install: $(HEADERDIR) $(LIBDIR) $(ODBCINST) install-headers \

diff --git a/dlg_specific.c b/dlg_specific.c
index ebe16c1c6e31d9225103e83f6e80f90894be98aa..96a045e1751602444c7e3e06e4d93762796b019a 100644 (file)
--- a/dlg_specific.c
+++ b/dlg_specific.c
@@ -23,7 +23,7 @@
 #ifndef WIN32
 #include <string.h>
 #include "gpps.h"
-#ifndef HAVE_SQLGETPRIVATEPROFILESTRING
+#ifdef HAVE_SQLGETPRIVATEPROFILESTRING
 #define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
 #define SQLWritePrivateProfileString(a,b,c,d) WritePrivateProfileString(a,b,c,d)
 #endif

diff --git a/misc.h b/misc.h
index 700e951e91725ceabe9182748a0f623758a430ac..8d0ad630bdf5346ae86089e7156710160a32508e 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -15,7 +15,8 @@
 #endif
 
 #ifndef WIN32
-#ifndef HAVE_SQLGETPRIVATEPROFILESTRING
+#include "gpps.h"
+#ifdef HAVE_SQLGETPRIVATEPROFILESTRING
 #define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
 #endif
 #endif