From 0bbfca6def7a39c03b7a0a4cba166fdf89f3c630 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 15 Aug 2016 20:11:49 +0100 Subject: [PATCH 1/3] autogen.sh: fail cleanly if autoconf fails Signed-off-by: Simon McVittie --- autogen.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 91d4b09d..6de735f0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -81,7 +81,10 @@ $ACLOCAL -I m4 $ACLOCAL_FLAGS (autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader $AUTOMAKE -a $am_opt -autoconf || echo "autoconf failed - version 2.5x is probably required" +if ! autoconf; then + echo "autoconf failed - version 2.5x is probably required" >&2 + exit 1 +fi cd $ORIGDIR From 095ca78ae7cbe343f2ad7ea447cb99f4a999c8c9 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 15 Aug 2016 20:12:19 +0100 Subject: [PATCH 2/3] Travis-CI: install new autoconf-archive build-dependency Signed-off-by: Simon McVittie --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7f09c1d9..09db640f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ install: - sudo apt-get -qq -y build-dep dbus - > sudo apt-get -qq -y install + autoconf-archive automake autotools-dev debhelper From 823801b467d40a3c2314a5ff92209f2857fb8987 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 15 Aug 2016 20:41:28 +0100 Subject: [PATCH 3/3] Travis-CI: fetch a newer autoconf-archive from Debian Signed-off-by: Simon McVittie --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 09db640f..48e21de7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ install: - sudo apt-get -qq -y build-dep dbus - > sudo apt-get -qq -y install - autoconf-archive automake autotools-dev debhelper @@ -35,6 +34,12 @@ install: - > test "$dbus_ci_host" != mingw || sudo apt-get -qq -y install binutils-mingw-w64-i686 g++-mingw-w64-i686 wine:i386 + # Ubuntu 14.04's autoconf-archive is too old + - > + wget + http://httpredir.debian.org/debian/pool/main/a/autoconf-archive/autoconf-archive_20150925-1_all.deb + - 'sudo dpkg -i autoconf-archive_*_all.deb' + - 'rm autoconf-archive_*_all.deb' script: # python-dbus and python-gi aren't available to Travis's version of # Python in /opt, which it uses as a default