From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 5 Dec 2016 20:57:34 +0000 (-0500)
Subject: switch bz2 dist to xz
X-Git-Tag: 4.5~28^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e33cb8ae1271c05fe1810fab70e649eb8b8bea65;p=thirdparty%2Fshadow.git

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 7492f07fd..8851f5d6a 100644
--- 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 cf774e033..7e3f246d7 100644
--- 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...