Skip to content

Commit

Permalink
Merge branch 'jn/less-reconfigure' into maint
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed Jan 12, 2013
2 parents 37a1130 + 1226504 commit 378e5e4
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2275,8 +2275,14 @@ configure: configure.ac GIT-VERSION-FILE
$(RM) $<+

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

0 comments on commit 378e5e4

Please sign in to comment.