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

diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index 7052e4c56a533c6222972be5ad914c56d65e43d6..6789a9988c052efccab8b4e8350c28e8537922fc 100644 (file)
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -13,7 +13,7 @@
 BUILDDIR=build
 
 .PHONY: startup missing-config-files
 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
 
 # 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
 
        @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
 
        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)
        /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

diff --git a/configure.ac b/configure.ac
index 77e2802316cebe463ebf6cb15dae4912f499f4c1..1f110d4c20416948222c240b1ac275cf211c4870 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -211,5 +211,4 @@ AC_SUBST(USE_NLS)
 AC_PATH_PROG(BASH, bash)
 
 AC_CONFIG_FILES([environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile:doc/Doxyfile.in])
 AC_PATH_PROG(BASH, bash)
 
 AC_CONFIG_FILES([environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile:doc/Doxyfile.in])

-AC_CONFIG_COMMANDS([default],[make -s dirs],[])

 AC_OUTPUT
 AC_OUTPUT

diff --git a/debian/rules b/debian/rules
index 60966b09f2e343792010ff785c5cccf6b9be5ac2..c8e7cb285bed743f8ac9afbae0e645d5ef86387d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -89,7 +89,7 @@ build/environment.mak: build/configure-stamp
 configure: configure.ac
 build/configure-stamp: configure buildlib/config.sub buildlib/config.guess
        dh_testdir
 configure: configure.ac
 build/configure-stamp: configure buildlib/config.sub buildlib/config.guess
        dh_testdir

-       -mkdir build
+       mkdir -p build

        cp COPYING debian/copyright
        cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags)
        touch $@
        cp COPYING debian/copyright
        cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags)
        touch $@