open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Makefile dependencies for Win32 timezones, per Claudio.

Browse Source
REL8_0_STABLE
Bruce Momjian 21 years ago
parent 3b382d1ae3
commit f3f8d36a57
4 changed files with 14 additions and 21 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 17
      configure
  2. 11
      configure.in
  3. 6
      src/timezone/Makefile
  4. 1
      src/timezone/pgtz.h

17
configure vendored
Unescape View File

@ -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}" 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*) case $host_os in mingw*);;
ac_config_commands="$ac_config_commands default-1" *)
ac_config_commands="$ac_config_commands check_win32_symlinks"
;; ;;
esac esac
@ -18450,16 +18451,9 @@ done
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
#
# INIT-COMMANDS section.
#
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF
for ac_config_target in $ac_config_targets 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/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/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}" ;; "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" ;; "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:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 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:$LINENO: executing $ac_dest commands" >&5
echo "$as_me: executing $ac_dest commands" >&6;} echo "$as_me: executing $ac_dest commands" >&6;}
case $ac_dest in case $ac_dest in
default-1 ) check_win32_symlinks )
# Links sometimes fail undetected on Mingw - # Links sometimes fail undetected on Mingw -
# so here we detect it and warn the user # so here we detect it and warn the user
for FILE in "$CONFIG_LINKS" for FILE in "$CONFIG_LINKS"
do do
# test -e works for symlinks in the MinGW console # 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 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;} echo "$as_me: WARNING: *** link for $FILE - please fix by hand" >&2;}
done done

11
configure.in
Unescape View File

@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script. 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
dnl Developers, please strive to achieve this order: dnl Developers, please strive to achieve this order:
dnl dnl
@ -1236,16 +1236,15 @@ AC_CONFIG_LINKS([
src/Makefile.port:src/makefiles/Makefile.${template} src/Makefile.port:src/makefiles/Makefile.${template}
]) ])
case $host_os in mingw*) case $host_os in mingw*);;
AC_OUTPUT_COMMANDS([ *)
AC_CONFIG_COMMANDS([check_win32_symlinks],[
# Links sometimes fail undetected on Mingw - # Links sometimes fail undetected on Mingw -
# so here we detect it and warn the user # so here we detect it and warn the user
for FILE in "$CONFIG_LINKS" for FILE in "$CONFIG_LINKS"
do do
# test -e works for symlinks in the MinGW console # 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" : '\(^:*\)'` || AC_MSG_WARN([*** link for $FILE - please fix by hand])
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 done
]) ])
;; ;;

6
src/timezone/Makefile
Unescape View File

@ -4,7 +4,7 @@
# Makefile for the timezone library # Makefile for the timezone library
# IDENTIFICATION # 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/%) TZDATAFILES := $(TZDATA:%=data/%)
ifeq ($(USE_PGTZ), yes) ifeq ($(USE_PGTZ), yes)
all: SUBSYS.o zic all: SUBSYS.o submake-libpgport zic
SUBSYS.o: $(OBJS) SUBSYS.o: $(OBJS)
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
@ -27,7 +27,7 @@ SUBSYS.o: $(OBJS)
zic: $(ZICOBJS) zic: $(ZICOBJS)
$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X) $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
install: zic install: all installdirs
./zic -d $(DESTDIR)$(datadir)/timezone $(TZDATAFILES) ./zic -d $(DESTDIR)$(datadir)/timezone $(TZDATAFILES)
clean distclean maintainer-clean: clean distclean maintainer-clean:

1
src/timezone/pgtz.h
Unescape View File

@ -1,4 +1,5 @@
#include "postgres.h" #include "postgres.h"
#include "miscadmin.h"
#ifndef HAVE_SYMLINK #ifndef HAVE_SYMLINK
#define HAVE_SYMLINK 0 #define HAVE_SYMLINK 0

Write Preview
Loading…
Cancel
Save