Add sys/time.h to fe-misc.c, prevent pgtclsh from using old libaries,

and allow CUSTOM_COPT to appear in compile AND LINK commands.

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 069973262ce8f1bb2bea2fe0a4d64fdc949efb06..4472d875e1010d7a70e492fc8c725a6e208cbdb9 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.41 1998/04/27 17:07:22 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.42 1998/05/12 15:42:08 momjian Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the 
@@ -257,6 +257,7 @@ endif
 
 ifdef COPT
    CFLAGS+= $(COPT)
+   LDFLAGS+= $(COPT)
 endif
 
 ifdef PROFILE

diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
index 1efe8930918ba336fc64ef4a8ec0016963259980..b0e474508e962430e61b5e965d3d89a7e4994835 100644 (file)
--- a/src/bin/pgtclsh/Makefile
+++ b/src/bin/pgtclsh/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.17 1998/04/06 16:51:35 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.18 1998/05/12 15:42:08 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -22,8 +22,8 @@ CFLAGS+= $(KRBFLAGS)
 endif
 
 # try to find libpgtcl.a in either directory
-LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -L$(LIBDIR) -lpgtcl
-LIBPQ= -L$(LIBPQDIR) -L$(LIBDIR) -lpq
+LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -lpgtcl
+LIBPQ= -L$(LIBPQDIR) -lpq
 
 all: pgtclsh pgtksh
 

diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index 6a1e5ec68312f3b2aa8102b310b160b8c8a92945..bbe112d2ef71677febb938fdb7b363bc303ac9d5 100644 (file)
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -24,7 +24,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.13 1998/05/07 16:17:16 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.14 1998/05/12 15:42:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <errno.h>
 #include <time.h>
+#include <sys/time.h>
 #if !defined(NO_UNISTD_H)
 #include <unistd.h>
 #endif