diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-12 00:48:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-12 00:48:03 (GMT) |
| commit | 378e5e4d9fe3bd339f47a6894ad9a33e7cc3879a (patch) | |
| tree | 66ef2a3375fca11ec42ed40112586bdedd4b1f48 | |
| parent | 37a11306d53c426c95d6736bdb7068c9bf19d0a1 (diff) | |
| parent | 122650457a619a6572c358ba9605a798ac771274 (diff) | |
| download | git-378e5e4d9fe3bd339f47a6894ad9a33e7cc3879a.zip git-378e5e4d9fe3bd339f47a6894ad9a33e7cc3879a.tar.gz git-378e5e4d9fe3bd339f47a6894ad9a33e7cc3879a.tar.bz2 | |
Merge branch 'jn/less-reconfigure' into maint
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
| -rw-r--r-- | Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -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; \ |