From f3f8d36a57047c43d1880cfe52e7ec6eef867614 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 18 May 2004 04:10:33 +0000
Subject: [PATCH] Update Makefile dependencies for Win32 timezones, per
 Claudio.

---
 configure             | 17 +++++------------
 configure.in          | 11 +++++------
 src/timezone/Makefile |  6 +++---
 src/timezone/pgtz.h   |  1 +
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/configure b/configure
index 8d8a0aabe4..fa17a78891 100755
--- a/configure
+++ b/configure
@@ -17974,8 +17974,9 @@ ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"
 ac_config_links="$ac_config_links src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION} src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION} src/include/dynloader.h:src/backend/port/dynloader/${template}.h src/include/pg_config_os.h:src/include/port/${template}.h src/Makefile.port:src/makefiles/Makefile.${template}"
 
 
-case $host_os in mingw*)
-ac_config_commands="$ac_config_commands default-1"
+case $host_os in mingw*);;
+*)
+ac_config_commands="$ac_config_commands check_win32_symlinks"
 
 	;;
 esac
@@ -18450,16 +18451,9 @@ done
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS section.
-#
 
 
 
-_ACEOF
-
-
 
 cat >>$CONFIG_STATUS <<\_ACEOF
 for ac_config_target in $ac_config_targets
@@ -18475,7 +18469,7 @@ do
   "src/include/dynloader.h" ) CONFIG_LINKS="$CONFIG_LINKS src/include/dynloader.h:src/backend/port/dynloader/${template}.h" ;;
   "src/include/pg_config_os.h" ) CONFIG_LINKS="$CONFIG_LINKS src/include/pg_config_os.h:src/include/port/${template}.h" ;;
   "src/Makefile.port" ) CONFIG_LINKS="$CONFIG_LINKS src/Makefile.port:src/makefiles/Makefile.${template}" ;;
-  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  "check_win32_symlinks" ) CONFIG_COMMANDS="$CONFIG_COMMANDS check_win32_symlinks" ;;
   "src/include/pg_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/pg_config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -19229,13 +19223,12 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
 echo "$as_me: executing $ac_dest commands" >&6;}
   case $ac_dest in
-    default-1 )
+    check_win32_symlinks )
 # Links sometimes fail undetected on Mingw -
 # so here we detect it and warn the user
 for FILE in "$CONFIG_LINKS"
  do
 	# test -e works for symlinks in the MinGW console
-	# We can't call AC_MSG_WARN from here, so we expand it
 	test -e `expr "$FILE" : '\(^:*\)'` || { echo "$as_me:$LINENO: WARNING: *** link for $FILE - please fix by hand" >&5
 echo "$as_me: WARNING: *** link for $FILE - please fix by hand" >&2;}
  done
diff --git a/configure.in b/configure.in
index 72f3e2675a..98c6c9b6e4 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.349 2004/05/17 19:14:47 momjian Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.350 2004/05/18 04:10:30 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -1236,16 +1236,15 @@ AC_CONFIG_LINKS([
   src/Makefile.port:src/makefiles/Makefile.${template}
 ])
 
-case $host_os in mingw*)
-AC_OUTPUT_COMMANDS([
+case $host_os in mingw*);;
+*)
+AC_CONFIG_COMMANDS([check_win32_symlinks],[
 # Links sometimes fail undetected on Mingw - 
 # so here we detect it and warn the user
 for FILE in "$CONFIG_LINKS"
  do
 	# test -e works for symlinks in the MinGW console
-	# We can't call AC_MSG_WARN from here, so we expand it
-	test -e `expr "$FILE" : '\(^:*\)'` || { echo "$as_me:$LINENO: WARNING: *** link for $FILE - please fix by hand" >&5
-echo "$as_me: WARNING: *** link for $FILE - please fix by hand" >&2;}
+	test -e `expr "$FILE" : '\(^:*\)'` || AC_MSG_WARN([*** link for $FILE - please fix by hand])
  done
 ])
 	;;
diff --git a/src/timezone/Makefile b/src/timezone/Makefile
index bb3d872543..8eb7ee3fc3 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.8 2004/05/17 14:35:34 momjian Exp $
+#    $PostgreSQL: pgsql/src/timezone/Makefile,v 1.9 2004/05/18 04:10:33 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -19,7 +19,7 @@ TZDATA := africa antarctica asia australasia europe northamerica southamerica pa
 TZDATAFILES := $(TZDATA:%=data/%)
 
 ifeq ($(USE_PGTZ), yes)
-all: SUBSYS.o zic
+all: SUBSYS.o submake-libpgport zic
 
 SUBSYS.o: $(OBJS)
 	$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
@@ -27,7 +27,7 @@ SUBSYS.o: $(OBJS)
 zic: $(ZICOBJS)
 	$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
 
-install: zic
+install: all installdirs
 	./zic -d $(DESTDIR)$(datadir)/timezone $(TZDATAFILES)
 
 clean distclean maintainer-clean:
diff --git a/src/timezone/pgtz.h b/src/timezone/pgtz.h
index 8d3daee94f..7129bff6ea 100644
--- a/src/timezone/pgtz.h
+++ b/src/timezone/pgtz.h
@@ -1,4 +1,5 @@
 #include "postgres.h"
+#include "miscadmin.h"
 
 #ifndef HAVE_SYMLINK
 #define HAVE_SYMLINK 0