diff options
| author |  Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-07-19 09:50:02 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-07-19 10:30:26 -0700 |
| commit | 8242ff470f2a34b5c0f193c4010cbf3d9b57f9bd (patch) | |
| tree | ee5a3c7d54d8768388522d421c234b27bf4e6d7a | |
| parent | build: "make clean" should not remove configure-generated files (diff) | |
| download | tgif-8242ff470f2a34b5c0f193c4010cbf3d9b57f9bd.tar.xz | |
build: reconfigure automatically if configure.ac changes
This provides a reduced but still useful sibling of the Automake's
"automatic Makefile rebuild" feature. It's important to note that
we take care to enable the new rules only if the tree that has already
be configured with './configure', so that users relying on manual
configuration won't be negatively impacted.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 14 insertions, 0 deletions
@@ -2158,6 +2158,18 @@ configure: configure.ac GIT-VERSION-FILE autoconf -o $@ $<+ && \ $(RM) $<+ +ifdef AUTOCONFIGURED +config.status: configure + $(QUIET_GEN)if test -f config.status; then \ + ./config.status --recheck; \ + else \ + ./configure; \ + fi +reconfigure config.mak.autogen: config.status + $(QUIET_GEN)./config.status +.PHONY: reconfigure # This is a convenience target. +endif + XDIFF_OBJS += xdiff/xdiffi.o XDIFF_OBJS += xdiff/xprepare.o XDIFF_OBJS += xdiff/xutils.o diff --git a/configure.ac b/configure.ac index a63fe77b82..df7e376590 100644 --- a/configure.ac +++ b/configure.ac @@ -148,6 +148,8 @@ AC_CONFIG_SRCDIR([git.c]) config_file=config.mak.autogen config_in=config.mak.in +GIT_CONF_SUBST([AUTOCONFIGURED], [YesPlease]) + # Directories holding "saner" versions of common or POSIX binaries. AC_ARG_WITH([sane-tool-path], [AS_HELP_STRING( |