[beast: 21/23] BUILD: don't create bz2 tarballs, .xz is enough

[Tim Janik <timj src gnome org>]

commit 33528604fd441852ec5d69ebf4065b7820594a8c
Author: Tim Janik <timj gnu org>
Date:   Fri Oct 9 10:24:53 2015 +0200

    BUILD: don't create bz2 tarballs, .xz is enough
    
    Signed-off-by: Tim Janik <timj gnu org>

 Makefile.am  |    9 +++------
 configure.ac |    2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 36c49ff..5c75344 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,20 +7,17 @@ EXTRA_DIST += HACKING.md
 noinst_DATA = HACKING.html
 CLEANFILES += HACKING.html
 
+MAINTAINERCLEANFILES += configure
+ACLOCAL_AMFLAGS  = -I autotools
+
 %.html: %.md
        pandoc -s --toc -N -S -f markdown_github+pandoc_title_block -t html --email-obfuscation=javascript \
          $< -o xgen-$(@F)
        mv xgen-$(@F) $@
 
-# require automake 1.9
-AUTOMAKE_OPTIONS = 1.9 dist-bzip2 no-dist-gzip -Wno-portability
-ACLOCAL_AMFLAGS  = -I autotools
-
 site site-preview site-update site-update-all site-update-pages site-update-galleries:
        @$(MAKE) -C web/ $(AM_MAKEFLAGS) $@
 
-MAINTAINERCLEANFILES += configure
-
 # check: message
 ALL_CHECKED_MSG = "All package tests passed"
 check: check-recursive
diff --git a/configure.ac b/configure.ac
index 076346c..4211c9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AC_CONFIG_SRCDIR([bse/bseconfig.h.in])
 AC_CONFIG_AUX_DIR([autotools])
 AC_CONFIG_MACRO_DIR([autotools])
 AC_CANONICAL_TARGET                                    # architecture information
-AM_INIT_AUTOMAKE(dist-xz tar-pax no-define foreign)
+AM_INIT_AUTOMAKE(1.9 dist-xz tar-pax no-dist-gzip no-define foreign)
 AM_CONFIG_HEADER(configure.h)
 # version handling
 BST_VERSION="$PACKAGE_VERSION"