From 82700281d0939242392da1247dd2a4c79df9d6b6 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 30 Apr 2004 16:08:01 +0000
Subject: [PATCH] More cleanups for USE_PGTZ.

---
 configure             | 2 +-
 configure.in          | 4 ++--
 src/backend/Makefile  | 6 +++++-
 src/timezone/Makefile | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 0b60ad3acb..74b98bee63 100755
--- a/configure
+++ b/configure
@@ -12018,7 +12018,7 @@ cat >>confdefs.h <<\_ACEOF
 #define USE_PGTZ 1
 _ACEOF
 
-PGTZ=yes
+USE_PGTZ=yes
  ;;
 esac
 
diff --git a/configure.in b/configure.in
index 65d3738f79..74e31f73fd 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.342 2004/04/30 15:01:25 momjian Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.343 2004/04/30 16:08:01 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -896,7 +896,7 @@ AC_LIBOBJ(pipe)
 AC_LIBOBJ(rand)
 AC_DEFINE(USE_PGTZ, 1,
 	[Define to 1 to use our own timezone library])
-PGTZ=yes
+USE_PGTZ=yes
 AC_SUBST(USE_PGTZ) ;;
 esac
 
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 5d342fa273..920a3a244d 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/backend/Makefile,v 1.98 2004/02/02 00:11:30 momjian Exp $
+# $PostgreSQL: pgsql/src/backend/Makefile,v 1.99 2004/04/30 16:08:01 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,6 +16,10 @@ DIRS := access bootstrap catalog parser commands executor lib libpq \
 	main nodes optimizer port postmaster regex rewrite \
 	storage tcop utils
 
+ifeq ($(USE_PGTZ), yes)
+DIRS+= $(top_builddir)/src/timezone
+endif
+
 OBJS := $(DIRS:%=%/SUBSYS.o)
 
 ifeq ($(PORTNAME), qnx4)
diff --git a/src/timezone/Makefile b/src/timezone/Makefile
index ac5926c79c..631f81f169 100644
--- a/src/timezone/Makefile
+++ b/src/timezone/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for the timezone library
 
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/timezone/Makefile,v 1.3 2004/04/30 14:24:14 momjian Exp $
+#    $PostgreSQL: pgsql/src/timezone/Makefile,v 1.4 2004/04/30 16:08:01 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,7 +20,7 @@ ZICOBJS= zic.o ialloc.o scheck.o localtime.o asctime.o pgtz.o
 TZDATA := africa antarctica asia australasia europe northamerica southamerica pacificnew etcetera factory backward systemv solar87 solar88 solar89
 TZDATAFILES := $(TZDATA:%=data/%)
 
-ifeq ($(PGTZ), yes)
+ifeq ($(USE_PGTZ), yes)
 all: SUBSYS.o zic
 
 SUBSYS.o: $(OBJS)
-- 
GitLab