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
This commit is contained in:
Junio C Hamano 2013-01-09 08:25:59 -08:00
Родитель 48b7f52455 122650457a
Коммит 85f2697048
1 изменённых файлов: 8 добавлений и 2 удалений

Просмотреть файл

@ -2313,8 +2313,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; \