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

Commitb05b981

Browse files
committed
stamp-h needs to be made by config.status, not elsewhere, per recipe in
Autoconf manual. In particular, touching it before creating config.statusis guaranteed to lose.
1 parentb3c4f03 commitb05b981

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

‎configure‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7806,9 +7806,6 @@ if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then
78067806
echo"$ac_t""done"1>&6
78077807
fi
78087808

7809-
# (see Makefile.global)
7810-
echo>src/include/stamp-h
7811-
78127809
trap'' 1 2 15
78137810
cat> confcache<<\EOF
78147811
# This file is a shell script that caches the results of configure
@@ -8291,6 +8288,9 @@ cat >> $CONFIG_STATUS <<EOF
82918288
EOF
82928289
cat>>$CONFIG_STATUS<<\EOF
82938290
8291+
# Update timestamp for config.h (see Makefile.global)
8292+
echo >src/include/stamp-h
8293+
82948294
exit 0
82958295
EOF
82968296
chmod +x$CONFIG_STATUS

‎configure.in‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,13 +1128,14 @@ if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then
11281128
AC_MSG_RESULT(done)
11291129
fi
11301130

1131-
# (see Makefile.global)
1132-
echo >src/include/stamp-h
1133-
11341131
AC_OUTPUT(
11351132
[
11361133
GNUmakefile
11371134
src/GNUmakefile
11381135
src/Makefile.global
11391136
src/backend/port/Makefile
1137+
],
1138+
[
1139+
# Update timestamp for config.h (see Makefile.global)
1140+
echo >src/include/stamp-h
11401141
])

‎src/Makefile.global.in‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.115 2000/12/16 13:03:25 petere Exp $
2+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.116 2000/12/29 20:39:06 tgl Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -305,15 +305,17 @@ $(top_builddir)/src/Makefile.global: $(top_srcdir)/src/Makefile.global.in $(top_
305305
# Remake config.h from config.h.in if the latter changed.
306306
# config.status will not change the timestamp on config.h if it
307307
# doesn't change, so as to avoid recompiling the entire tree
308-
# unnecessarily. Therefore config.status will update a timestamp file
309-
# everytime it runs so that we don't trigger this rule everytime.
308+
# unnecessarily. Therefore we make config.status update a timestamp file
309+
# stamp-h everytime it runs, so that we don't trigger this rule everytime.
310+
# (We do trigger the null rule for stamp-h to config.h everytime; so it's
311+
# important for that rule to be null!)
310312
#
311313
# Of course you need to turn on dependency tracking to get any
312-
# dependencies on config.h
314+
# dependencies on config.h.
313315
$(top_builddir)/src/include/config.h:$(top_builddir)/src/include/stamp-h
316+
314317
$(top_builddir)/src/include/stamp-h:$(top_srcdir)/src/include/config.h.in$(top_builddir)/config.status
315318
cd$(top_builddir)&& CONFIG_FILES= CONFIG_HEADERS=src/include/config.h ./config.status
316-
echo>$@
317319

318320
# When configure changes, rerun configure with the same options as
319321
# last time. To change configure, you need to run autoconf manually.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp