More cleanups for USE_PGTZ.

bmomjian · bmomjian · commit 82700281d093 · 2004-04-30T16:08:01.000Z
diff --git 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
@@ -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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $PostgreSQL: pgsql/src/backend/Makefile,v 1.98 2004/02/02 00:11:30 momjian Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/backend/Makefile,v 1.99 2004/04/30 16:08:01 momjian Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -16,6 +16,10 @@ DIRS := access bootstrap catalog parser commands executor lib libpq \`
`16`	`16`	`main nodes optimizer port postmaster regex rewrite \`
`17`	`17`	`storage tcop utils`
`18`	`18`
	`19`	`+ifeq ($(USE_PGTZ), yes)`
	`20`	`+DIRS+= $(top_builddir)/src/timezone`
	`21`	`+endif`
	`22`	`+`
`19`	`23`	`OBJS := $(DIRS:%=%/SUBSYS.o)`
`20`	`24`
`21`	`25`	`ifeq ($(PORTNAME), qnx4)`