From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 13 May 2004 22:59:14 +0000 (+0000)
Subject: Refactor code to warn about configure link failures on MinGW.
X-Git-Tag: REL8_0_0BETA1~646
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a676b852e8128212d2a357e2b4f32cca16daf0d7;p=postgresql

Refactor code to warn about configure link failures on MinGW.
---

diff --git a/configure b/configure
index 742bbabfc4..e47b9efe6d 100755
--- a/configure
+++ b/configure
@@ -17974,25 +17974,6 @@ 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}"
 
 
-# Links sometimes fail undetected on Mingw -
-# so here we detect it and warn the user
-case $host_os in mingw*)
- for linktarget in \
-	src/backend/port/tas.s \
-	src/backend/port/dynloader.c \
-	src/backend/port/pg_sema.c \
-	src/backend/port/pg_shmem.c \
-	src/include/dynloader.h \
-	src/include/pg_config_os.h \
-	src/Makefile.port
- do
-	# test -e works for symlinks in the MinGW console
-	test -e $linktarget || { echo "$as_me:$LINENO: WARNING: *** link for $linktarget failed - please fix by hand" >&5
-echo "$as_me: WARNING: *** link for $linktarget failed - please fix by hand" >&2;}
- done
-	;;
-esac
-
 ac_config_headers="$ac_config_headers src/include/pg_config.h"
 
 
@@ -19201,3 +19182,16 @@ if test "$no_create" != yes; then
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
+
+# Links sometimes fail undetected on Mingw -
+# so here we detect it and warn the user
+case $host_os in mingw*)
+for FILE in "$CONFIG_LINKS"
+ do
+	# test -e works for symlinks in the MinGW console
+	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
+	;;
+esac
+
diff --git a/configure.in b/configure.in
index b198162ede..2158d5ab6a 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.347 2004/05/13 01:45:02 momjian Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.348 2004/05/13 22:59:14 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -1236,28 +1236,22 @@ AC_CONFIG_LINKS([
   src/Makefile.port:src/makefiles/Makefile.${template}
 ])
 
+AC_CONFIG_HEADERS([src/include/pg_config.h],
+[
+# Update timestamp for pg_config.h (see Makefile.global)
+echo >src/include/stamp-h
+])
+
+AC_OUTPUT
+
 # Links sometimes fail undetected on Mingw - 
 # so here we detect it and warn the user
 case $host_os in mingw*)
- for linktarget in \
-	src/backend/port/tas.s \
-	src/backend/port/dynloader.c \
-	src/backend/port/pg_sema.c \
-	src/backend/port/pg_shmem.c \
-	src/include/dynloader.h \
-	src/include/pg_config_os.h \
-	src/Makefile.port
+for FILE in "$CONFIG_LINKS"
  do
 	# test -e works for symlinks in the MinGW console
-	test -e $linktarget || AC_MSG_WARN([*** link for $linktarget failed - please fix by hand])
+	test -e `expr "$FILE" : '\([^:]*\)'` || AC_MSG_WARN([*** link for $FILE - please fix by hand])
  done
 	;;
 esac
 
-AC_CONFIG_HEADERS([src/include/pg_config.h],
-[
-# Update timestamp for pg_config.h (see Makefile.global)
-echo >src/include/stamp-h
-])
-
-AC_OUTPUT