Integrate timezone library to be called only from Win32.

Timezone code backend integration done by Magnus Hagander.

diff --git a/configure b/configure
index 00408f9326a5aa1664e1c35a1646eed2fe633a3e..d00f9bc38f1bd10f15b51ce7c0770ba2aaf0b554 100755 (executable)
--- a/configure
+++ b/configure
@@ -12017,6 +12017,8 @@ LIBOBJS="$LIBOBJS rand.$ac_objext"
 cat >>confdefs.h <<\_ACEOF
 #define PGTZ 1
 _ACEOF
+
+PGTZ=yes
  ;;
 esac
 
@@ -18611,6 +18613,7 @@ s,@python_includespec@,$python_includespec,;t t
 s,@python_libspec@,$python_libspec,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@HAVE_IPV6@,$HAVE_IPV6,;t t
+s,@PGTZ@,$PGTZ,;t t
 s,@acx_pthread_config@,$acx_pthread_config,;t t
 s,@PTHREAD_CC@,$PTHREAD_CC,;t t
 s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t

diff --git a/configure.in b/configure.in
index fe540588c68ba1194336610e2a37927732710194..4b23f23d7f47b5d59f06cf5a5b7d7c52d300ff66 100644 (file)
--- 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.340 2004/04/30 04:18:28 momjian Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.341 2004/04/30 04:31:51 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -895,7 +895,9 @@ AC_LIBOBJ(open)
 AC_LIBOBJ(pipe)
 AC_LIBOBJ(rand)
 AC_DEFINE(PGTZ, 1,
-   [Define to 1 to use our own timezone library]) ;;
+   [Define to 1 to use our own timezone library])
+PGTZ=yes
+AC_SUBST(PGTZ) ;;
 esac
 
 # Win32 can't to rename or unlink on an open file

diff --git a/src/Makefile b/src/Makefile
index c1996cc1b4a9f7bba6b2a3cbdc040393e57e71e1..a42b0620e01888391586897351817790fea8fea5 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/Makefile,v 1.31 2004/04/26 00:48:38 momjian Exp $
+# $PostgreSQL: pgsql/src/Makefile,v 1.32 2004/04/30 04:31:52 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,6 +15,7 @@ include Makefile.global
 
 all install installdirs uninstall dep depend distprep:
    $(MAKE) -C port $@
+   $(MAKE) -C timezone $@
    $(MAKE) -C backend $@
    $(MAKE) -C backend/utils/mb/conversion_procs $@
    $(MAKE) -C include $@
@@ -27,6 +28,7 @@ install-all-headers:
 
 clean:
    $(MAKE) -C port $@
+   $(MAKE) -C timezone $@
    $(MAKE) -C backend $@
    $(MAKE) -C include $@
    $(MAKE) -C interfaces $@
@@ -39,6 +41,7 @@ clean:
 
 distclean maintainer-clean:
    -$(MAKE) -C port $@
+   -$(MAKE) -C timezone $@
    -$(MAKE) -C backend $@
    -$(MAKE) -C include $@
    -$(MAKE) -C interfaces $@

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 9d6e1b41043563f398b560c0a0f3dd09d9cb4d81..66f1a56652feb49be31ef31900de319181c1e608 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.178 2004/04/23 18:15:53 momjian Exp $
+# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.179 2004/04/30 04:31:52 momjian Exp $
 
 #------------------------------------------------------------------------------
 # All PostgreSQL makefiles include this file and use the variables it sets,
@@ -150,6 +150,8 @@ TK_XINCLUDES        = @TK_XINCLUDES@
 PTHREAD_CFLAGS     = @PTHREAD_CFLAGS@
 PTHREAD_LIBS       = @PTHREAD_LIBS@
 
+PGTZ           = @PGTZ@
+
 have_docbook   = @have_docbook@
 DOCBOOKSTYLE   = @DOCBOOKSTYLE@
 COLLATEINDEX   = @COLLATEINDEX@

diff --git a/src/timezone/Makefile b/src/timezone/Makefile
index b087b818ffc819cd372f252b88da637ae8c22b5a..b94bb663f24e1f44a8cf32d64b37a31b80fb7b8a 100644 (file)
--- a/src/timezone/Makefile
+++ b/src/timezone/Makefile
@@ -4,26 +4,26 @@
 #    Makefile for the timezone library
 
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/timezone/Makefile,v 1.1 2004/04/30 04:09:23 momjian Exp $
+#    $PostgreSQL: pgsql/src/timezone/Makefile,v 1.2 2004/04/30 04:31:52 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
-subdir = src/port/tz
-top_builddir = ../../..
+subdir = src/tz
+top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
 OBJS= asctime.o difftime.o localtime.o pgtz.o
-ZICOBJS= zic.o ialloc.o scheck.o localtime.o asctime.o pgtz.o ../path.o
+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)
 all: SUBSYS.o zic
 
 SUBSYS.o: $(OBJS)
    $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
 
-
 zic: $(ZICOBJS)
 
 install: zic
@@ -31,3 +31,5 @@ install: zic
 
 clean distclean maintainer-clean:
    rm -f SUBSYS.o $(OBJS) $(ZICOBJS)
+endif
+