More cleanups for USE_PGTZ.

This commit is contained in:
Bruce Momjian 2004-04-30 16:08:01 +00:00
parent b99a3a7541
commit 82700281d0
4 changed files with 10 additions and 6 deletions

2
configure vendored
View File

@ -12018,7 +12018,7 @@ cat >>confdefs.h <<\_ACEOF
#define USE_PGTZ 1
_ACEOF
PGTZ=yes
USE_PGTZ=yes
;;
esac

View File

@ -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

View File

@ -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)

View File

@ -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)