From c312583767d9f343de76a4414e3950e6de61fbf1 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 12 May 1998 15:42:09 +0000
Subject: [PATCH] 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.
---
src/Makefile.global.in | 3 ++-
src/bin/pgtclsh/Makefile | 6 +++---
src/interfaces/libpq/fe-misc.c | 3 ++-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 069973262ce..4472d875e10 100644
--- 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 1efe8930918..b0e474508e9 100644
--- 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 6a1e5ec6831..bbe112d2ef7 100644
--- 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
--
GitLab