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

Commit4307ca2

Browse files
committed
Improve configure win32 link test to run from config.status.
Andrew Dunstan
1 parentd14db13 commit4307ca2

File tree

2 files changed

+103
-23
lines changed

2 files changed

+103
-23
lines changed

‎configure

Lines changed: 88 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17974,6 +17974,12 @@ 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+
case $host_os in mingw*)
17978+
ac_config_commands="$ac_config_commands default-1"
17979+
17980+
;;
17981+
esac
17982+
1797717983
ac_config_headers="$ac_config_headers src/include/pg_config.h"
1797817984

1797917985

@@ -18359,6 +18365,9 @@ $config_headers
1835918365
Configuration links:
1836018366
$config_links
1836118367

18368+
Configuration commands:
18369+
$config_commands
18370+
1836218371
Report bugs to <bug-autoconf@gnu.org>."
1836318372
_ACEOF
1836418373

@@ -18441,7 +18450,14 @@ done
1844118450

1844218451
_ACEOF
1844318452

18453+
cat >>$CONFIG_STATUS <<_ACEOF
18454+
#
18455+
# INIT-COMMANDS section.
18456+
#
18457+
18458+
1844418459

18460+
_ACEOF
1844518461

1844618462

1844718463

@@ -18459,6 +18475,7 @@ do
1845918475
"src/include/dynloader.h" ) CONFIG_LINKS="$CONFIG_LINKS src/include/dynloader.h:src/backend/port/dynloader/${template}.h" ;;
1846018476
"src/include/pg_config_os.h" ) CONFIG_LINKS="$CONFIG_LINKS src/include/pg_config_os.h:src/include/port/${template}.h" ;;
1846118477
"src/Makefile.port" ) CONFIG_LINKS="$CONFIG_LINKS src/Makefile.port:src/makefiles/Makefile.${template}" ;;
18478+
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
1846218479
"src/include/pg_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/pg_config.h" ;;
1846318480
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
1846418481
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -18474,6 +18491,7 @@ if $ac_need_defaults; then
1847418491
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
1847518492
test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
1847618493
test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
18494+
test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
1847718495
fi
1847818496

1847918497
# Create a temporary directory, and hook for its removal unless debugging.
@@ -19155,6 +19173,76 @@ echo "$as_me: error: cannot link $ac_dest to $srcdir/$ac_source" >&2;}
1915519173
{ (exit 1); exit 1; }; }
1915619174
done
1915719175
_ACEOF
19176+
cat >>$CONFIG_STATUS <<\_ACEOF
19177+
19178+
#
19179+
# CONFIG_COMMANDS section.
19180+
#
19181+
for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
19182+
ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
19183+
ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
19184+
ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
19185+
$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
19186+
X"$ac_dest" : 'X\(//\)[^/]' \| \
19187+
X"$ac_dest" : 'X\(//\)$' \| \
19188+
X"$ac_dest" : 'X\(/\)' \| \
19189+
. : '\(.\)' 2>/dev/null ||
19190+
echo X"$ac_dest" |
19191+
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
19192+
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
19193+
/^X\(\/\/\)$/{ s//\1/; q; }
19194+
/^X\(\/\).*/{ s//\1/; q; }
19195+
s/.*/./; q'`
19196+
ac_builddir=.
19197+
19198+
if test "$ac_dir" != .; then
19199+
ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
19200+
# A "../" for each directory in $ac_dir_suffix.
19201+
ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
19202+
else
19203+
ac_dir_suffix= ac_top_builddir=
19204+
fi
19205+
19206+
case $srcdir in
19207+
.) # No --srcdir option. We are building in place.
19208+
ac_srcdir=.
19209+
if test -z "$ac_top_builddir"; then
19210+
ac_top_srcdir=.
19211+
else
19212+
ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
19213+
fi ;;
19214+
[\\/]* | ?:[\\/]* ) # Absolute path.
19215+
ac_srcdir=$srcdir$ac_dir_suffix;
19216+
ac_top_srcdir=$srcdir ;;
19217+
*) # Relative path.
19218+
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
19219+
ac_top_srcdir=$ac_top_builddir$srcdir ;;
19220+
esac
19221+
# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
19222+
# absolute.
19223+
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
19224+
ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
19225+
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
19226+
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
19227+
19228+
19229+
{ echo "$as_me:$LINENO: executing $ac_dest commands" >&5
19230+
echo "$as_me: executing $ac_dest commands" >&6;}
19231+
case $ac_dest in
19232+
default-1 )
19233+
# Links sometimes fail undetected on Mingw -
19234+
# so here we detect it and warn the user
19235+
for FILE in "$CONFIG_LINKS"
19236+
do
19237+
# test -e works for symlinks in the MinGW console
19238+
# We can't call AC_MSG_WARN from here, so we expand it
19239+
test -e `expr "$FILE" : '\(^:*\)'` || { echo "$as_me:$LINENO: WARNING: *** link for $FILE - please fix by hand" >&5
19240+
echo "$as_me: WARNING: *** link for $FILE - please fix by hand" >&2;}
19241+
done
19242+
;;
19243+
esac
19244+
done
19245+
_ACEOF
1915819246

1915919247
cat >>$CONFIG_STATUS <<\_ACEOF
1916019248

@@ -19183,15 +19271,3 @@ if test "$no_create" != yes; then
1918319271
fi
1918419272

1918519273

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: 15 additions & 11 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.348 2004/05/13 22:59:14 momjian Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.349 2004/05/17 19:14:47 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -1236,22 +1236,26 @@ 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-
1239+
case $host_os in mingw*)
1240+
AC_OUTPUT_COMMANDS([
12471241
# Links sometimes fail undetected on Mingw -
12481242
# so here we detect it and warn the user
1249-
case $host_os in mingw*)
12501243
for FILE in "$CONFIG_LINKS"
12511244
do
12521245
# test -e works for symlinks in the MinGW console
1253-
test -e `expr "$FILE" : '\([^:]*\)'` || AC_MSG_WARN([*** link for $FILE - please fix by hand])
1246+
# We can't call AC_MSG_WARN from here, so we expand it
1247+
test -e `expr "$FILE" : '\(^:*\)'` || { echo "$as_me:$LINENO: WARNING: *** link for $FILE - please fix by hand" >&5
1248+
echo "$as_me: WARNING: *** link for $FILE - please fix by hand" >&2;}
12541249
done
1250+
])
12551251
;;
12561252
esac
12571253

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

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp