Skip to content

Commit 1226504

Browse files
jrngitster
authored andcommitted
build: do not automatically reconfigure unless configure.ac changed
Starting with v1.7.12-rc0~4^2 (build: reconfigure automatically if configure.ac changes, 2012-07-19), "config.status --recheck" is automatically run every time the "configure" script changes. In particular, that means the configuration procedure repeats whenever the version number changes (since the configure script changes to support "./configure --version" and "./configure --help"), making bisecting painfully slow. The intent was to make the reconfiguration process only trigger for changes to configure.ac's logic. Tweak the Makefile rule to match that intent by depending on configure.ac instead of configure. Reported-by: Martin von Zweigbergk <[email protected]> Signed-off-by: Jonathan Nieder <[email protected]> Reviewed-by: Jeff King <[email protected]> Reviewed-by: Stefano Lattarini <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7e20105 commit 1226504

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2167,8 +2167,14 @@ configure: configure.ac GIT-VERSION-FILE
21672167
$(RM) $<+
21682168

21692169
ifdef AUTOCONFIGURED
2170-
config.status: configure
2171-
$(QUIET_GEN)if test -f config.status; then \
2170+
# We avoid depending on 'configure' here, because it gets rebuilt
2171+
# every time GIT-VERSION-FILE is modified, only to update the embedded
2172+
# version number string, which config.status does not care about. We
2173+
# do want to recheck when the platform/environment detection logic
2174+
# changes, hence this depends on configure.ac.
2175+
config.status: configure.ac
2176+
$(QUIET_GEN)$(MAKE) configure && \
2177+
if test -f config.status; then \
21722178
./config.status --recheck; \
21732179
else \
21742180
./configure; \

0 commit comments

Comments
 (0)