4 files changed, 5 insertions, 2 deletions
diff --git a/src/interfaces/odbc/GNUmakefile b/src/interfaces/odbc/GNUmakefile
index e24d9e26f54..a6aedb936ad 100644
--- a/src/interfaces/odbc/GNUmakefile
+++ b/src/interfaces/odbc/GNUmakefile
@@ -2,7 +2,7 @@
 #
 # GNUMakefile for psqlodbc (Postgres ODBC driver)
 #
-# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.6 2000/10/23 21:43:58 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.7 2000/10/28 15:10:36 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -23,7 +23,7 @@ OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \
         pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o \
         gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX)
 
-SHLIB_LINK= -lm
+SHLIB_LINK = $(filter -lm, $(LIBS))
 
 all: all-lib
 
diff --git a/src/interfaces/odbc/bind.c b/src/interfaces/odbc/bind.c
index 1a1b32c9dfc..0c3970977aa 100644
--- a/src/interfaces/odbc/bind.c
+++ b/src/interfaces/odbc/bind.c
@@ -24,6 +24,7 @@
 #include "pgtypes.h"
 #include <stdlib.h>
 #include <malloc.h>
+#include <string.h>
 
 #ifndef WIN32
 #include "iodbc.h"
diff --git a/src/interfaces/odbc/environ.c b/src/interfaces/odbc/environ.c
index 1c4cfef3670..0b95291881d 100644
--- a/src/interfaces/odbc/environ.c
+++ b/src/interfaces/odbc/environ.c
@@ -18,6 +18,7 @@
 #include "statement.h"
 #include <stdlib.h>
 #include <malloc.h>
+#include <string.h>
 
 /* The one instance of the handles */
 ConnectionClass *conns[MAX_CONNECTIONS];
diff --git a/src/interfaces/odbc/options.c b/src/interfaces/odbc/options.c
index 217f063338e..c9d6d107bd5 100644
--- a/src/interfaces/odbc/options.c
+++ b/src/interfaces/odbc/options.c
@@ -18,6 +18,7 @@
 #endif
 
 #include "psqlodbc.h"
+#include <string.h>
 
 #ifndef WIN32
 #include "iodbc.h"