Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commita676b85

Browse files
committed
Refactor code to warn about configure link failures on MinGW.
1 parentf69ecb4 commita676b85

File tree

2 files changed

+24
-36
lines changed

2 files changed

+24
-36
lines changed

‎configure

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17974,25 +17974,6 @@ ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"
1797417974
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}"
1797517975

1797617976

17977-
# Links sometimes fail undetected on Mingw -
17978-
# so here we detect it and warn the user
17979-
case $host_os in mingw*)
17980-
for linktarget in \
17981-
src/backend/port/tas.s \
17982-
src/backend/port/dynloader.c \
17983-
src/backend/port/pg_sema.c \
17984-
src/backend/port/pg_shmem.c \
17985-
src/include/dynloader.h \
17986-
src/include/pg_config_os.h \
17987-
src/Makefile.port
17988-
do
17989-
# test -e works for symlinks in the MinGW console
17990-
test -e $linktarget || { echo "$as_me:$LINENO: WARNING: *** link for $linktarget failed - please fix by hand" >&5
17991-
echo "$as_me: WARNING: *** link for $linktarget failed - please fix by hand" >&2;}
17992-
done
17993-
;;
17994-
esac
17995-
1799617977
ac_config_headers="$ac_config_headers src/include/pg_config.h"
1799717978

1799817979

@@ -19201,3 +19182,16 @@ if test "$no_create" != yes; then
1920119182
$ac_cs_success || { (exit 1); exit 1; }
1920219183
fi
1920319184

19185+
19186+
# Links sometimes fail undetected on Mingw -
19187+
# so here we detect it and warn the user
19188+
case $host_os in mingw*)
19189+
for FILE in "$CONFIG_LINKS"
19190+
do
19191+
# test -e works for symlinks in the MinGW console
19192+
test -e `expr "$FILE" : '\(^:*\)'` || { echo "$as_me:$LINENO: WARNING: *** link for $FILE - please fix by hand" >&5
19193+
echo "$as_me: WARNING: *** link for $FILE - please fix by hand" >&2;}
19194+
done
19195+
;;
19196+
esac
19197+

‎configure.in

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.347 2004/05/1301:45:02 momjian Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.348 2004/05/1322:59:14 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -1236,28 +1236,22 @@ AC_CONFIG_LINKS([
12361236
src/Makefile.port:src/makefiles/Makefile.${template}
12371237
])
12381238

1239+
AC_CONFIG_HEADERS([src/include/pg_config.h],
1240+
[
1241+
# Update timestamp for pg_config.h (see Makefile.global)
1242+
echo >src/include/stamp-h
1243+
])
1244+
1245+
AC_OUTPUT
1246+
12391247
# Links sometimes fail undetected on Mingw -
12401248
# so here we detect it and warn the user
12411249
case $host_os in mingw*)
1242-
for linktarget in \
1243-
src/backend/port/tas.s \
1244-
src/backend/port/dynloader.c \
1245-
src/backend/port/pg_sema.c \
1246-
src/backend/port/pg_shmem.c \
1247-
src/include/dynloader.h \
1248-
src/include/pg_config_os.h \
1249-
src/Makefile.port
1250+
for FILE in "$CONFIG_LINKS"
12501251
do
12511252
# test -e works for symlinks in the MinGW console
1252-
test -e$linktarget|| AC_MSG_WARN([*** link for $linktarget failed - please fix by hand])
1253+
test -e`expr "$FILE" : '\([^:]*\)'`|| AC_MSG_WARN([*** link for $FILE - please fix by hand])
12531254
done
12541255
;;
12551256
esac
12561257

1257-
AC_CONFIG_HEADERS([src/include/pg_config.h],
1258-
[
1259-
# Update timestamp for pg_config.h (see Makefile.global)
1260-
echo >src/include/stamp-h
1261-
])
1262-
1263-
AC_OUTPUT

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp