Skip to content

Commit

Permalink
Check for automake 1.11, for dist-xz support.
Browse files Browse the repository at this point in the history
If you have 1.11, but the check still fails, then run:
WANT_AUTOMAKE=1.11 ./autogen.sh

See 512ef27.
  • Loading branch information
Cyp committed Aug 31, 2012
1 parent 0a381b3 commit c3ba962
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion autogen.sh
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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"])
Expand Down

0 comments on commit c3ba962

Please sign in to comment.