Skip to content

Commit 85f2697

Browse files
committed
Merge branch 'jn/less-reconfigure'
When autoconf is used, any build on a different commit always ran "config.status --recheck" even when unnecessary. * jn/less-reconfigure: build: do not automatically reconfigure unless configure.ac changed
2 parents 48b7f52 + 1226504 commit 85f2697

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
@@ -2313,8 +2313,14 @@ configure: configure.ac GIT-VERSION-FILE
23132313
$(RM) $<+
23142314

23152315
ifdef AUTOCONFIGURED
2316-
config.status: configure
2317-
$(QUIET_GEN)if test -f config.status; then \
2316+
# We avoid depending on 'configure' here, because it gets rebuilt
2317+
# every time GIT-VERSION-FILE is modified, only to update the embedded
2318+
# version number string, which config.status does not care about. We
2319+
# do want to recheck when the platform/environment detection logic
2320+
# changes, hence this depends on configure.ac.
2321+
config.status: configure.ac
2322+
$(QUIET_GEN)$(MAKE) configure && \
2323+
if test -f config.status; then \
23182324
./config.status --recheck; \
23192325
else \
23202326
./configure; \

0 commit comments

Comments
 (0)