From 520624d562e54e8e2c0191fae723e668e3ece6b4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 19 Nov 2015 22:39:13 +0100 Subject: do not rerun ./configure causing FTCBFS with newer autotools-dev If the config.{sub,guess} files we linked in were newer than our configure script we ended up recreating configure and then rerun it without all the configuration options which were (potentially) present for a previous run. We avoid this by changing to the same ruleset as in the debian/rules file which compares the config.* files against a stamp file rather than the configure script itself as its the configuration itself which depends on all scripts, not configure on the config scripts. While at it, we also drop the 'make -s dirs' call as we don't need to do it explicitly here as proper dependencies will take care of it. Thanks: Helmut Grohne for the detailed bugreport. Closes: 804923 --- buildlib/configure.mak | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'buildlib') diff --git a/buildlib/configure.mak b/buildlib/configure.mak index 7052e4c56..6789a9988 100644 --- a/buildlib/configure.mak +++ b/buildlib/configure.mak @@ -13,7 +13,7 @@ BUILDDIR=build .PHONY: startup missing-config-files -startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED)) +startup: $(BUILDDIR)/configure-stamp $(addprefix $(BUILDDIR)/,$(CONVERTED)) # use the files provided from the system instead of carry around # and use (most of the time outdated) copycats @@ -48,14 +48,15 @@ missing-config-files: @echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" exit 100 -configure: aclocal.m4 configure.ac buildlib/config.guess buildlib/config.sub +configure: aclocal.m4 configure.ac autoconf aclocal.m4: $(wildcard buildlib/*.m4) aclocal -I buildlib -$(BUILDDIR)/config.status: configure +$(BUILDDIR)/configure-stamp: configure buildlib/config.guess buildlib/config.sub /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR) (HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure) + touch $(BUILDDIR)/configure-stamp -$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/config.status +$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/configure-stamp -- cgit v1.2.3