switch bz2 dist to xz

Since xz is fairly common nowadays, and is typically smaller/faster than
bzip2 for people to decompress, switch shadow over too.  We also merge
the two init locations into configure.ac to match newer autotools style.

The min automake version is bumped to 1.11 too since that's when xz was
released.

diff --git a/Makefile.am b/Makefile.am
index 7492f07fdc63dbd635d8522600d6cac2dce654fc..8851f5d6aadeb75e8730474cd4278f5f7a05f6c0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,5 @@
 
 EXTRA_DIST = NEWS README TODO shadow.spec.in
 
-AUTOMAKE_OPTIONS = 1.5 dist-bzip2 foreign
-
 SUBDIRS = po man libmisc lib src \
        contrib doc etc

diff --git a/configure.ac b/configure.ac
index cf774e033290d44c3de9e7306f8d27ae1902b890..7e3f246d7348062bede6082a1d8187eefb429ff2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.64])
 AC_INIT([shadow], [4.4], [pkg-shadow-devel@lists.alioth.debian.org], [],
        [https://github.com/shadow-maint/shadow])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.11 foreign dist-xz])
 AC_CONFIG_HEADERS([config.h])
 
 dnl Some hacks...