git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/configure b/configure

index 0b60ad3acbba68f5c428e23514d6659a44bb6cd1..74b98bee632fb82dbd9d1002bb5936ce8f469d3c 100755 (executable)

--- a/configure

+++ b/configure

#define USE_PGTZ 1

_ACEOF

-PGTZ=yes

+USE_PGTZ=yes

;;

esac

diff --git a/configure.in b/configure.in

index 65d3738f793302953434974bed50537ec2d91699..74e31f73fde59458963ca3112b10290269efafa0 100644 (file)

--- a/configure.in

+++ b/configure.in

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

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 5d342fa2735541c066b185bed56731ba5c2175dd..920a3a244d767b4c67875d2bb75d528b1b9a996e 100644 (file)

--- a/src/backend/Makefile

+++ b/src/backend/Makefile

#

# 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 $

#

#-------------------------------------------------------------------------

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 ac5926c79c7f687d87ebc5cad59f22fbdf0567c4..631f81f169a69d9c53cf452c69c9c0dcb85a060a 100644 (file)

--- a/src/timezone/Makefile

+++ b/src/timezone/Makefile

# 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 $

#

#-------------------------------------------------------------------------

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)