From c3ba9625b96fea6ceb036cd387a511a98523bd86 Mon Sep 17 00:00:00 2001 From: Cyp Date: Fri, 31 Aug 2012 07:54:05 +0200 Subject: [PATCH] Check for automake 1.11, for dist-xz support. If you have 1.11, but the check still fails, then run: WANT_AUTOMAKE=1.11 ./autogen.sh See 512ef27f4d4185d004977e0be4b972bfa130c57d. --- autogen.sh | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 65290fab9ea..ca7ad13f64a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -149,7 +149,7 @@ not_version () cd "$SRCDIR" version_check 1 "autoconf" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 56 || DIE=1 -version_check 1 "automake" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 10 || DIE=1 +version_check 1 "automake" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 11 || DIE=1 if [ "$DIE" -eq 1 ]; then exit 1 fi diff --git a/configure.ac b/configure.ac index adc6c5dde05..d26b2f8b73f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.56]) AC_INIT([Warzone 2100],[bugfixes],[http://wz2100.net/],[warzone2100]) -AM_INIT_AUTOMAKE([1.10 tar-ustar no-dist-gzip dist-xz]) +AM_INIT_AUTOMAKE([1.11 tar-ustar no-dist-gzip dist-xz]) # Set to the default or stupid automake will use the much slower but useless -e(xtreme!!!) option. AC_SUBST([XZ_OPT], ["-6"])