Makefile.am: require automake 1.9

With heavy use of conditionals, I broke Makefile.am for the ancient
automake version 1.6.  Instead of supporting this automake version
forever, I'm removing support for it now.  Since automake isn't
required on the build machine, nobody should have a serious problem
with that.

3 files changed, 3 insertions, 3 deletions

diff --git a/Makefile.am b/Makefile.am
index 3b101edb..49a3436f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign 1.6
+AUTOMAKE_OPTIONS = foreign 1.9 dist-bzip2
 
 SUBDIRS = src doc
 docs = README UPGRADING
diff --git a/autogen.sh b/autogen.sh
index 7629b98c..95d8337a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,7 +16,7 @@ if test -n "$AM_FORCE_VERSION"
 then
 	AM_VERSIONS="$AM_FORCE_VERSION"
 else
-	AM_VERSIONS='1.6 1.7 1.8 1.9'
+	AM_VERSIONS='1.9 1.10'
 fi
 if test -n "$AC_FORCE_VERSION"
 then
diff --git a/configure.ac b/configure.ac
index 565c2640..4ab99200 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl AM_INIT_AUTOMAKE(mpd, 0.14.0)
 
 AC_PREREQ(2.60)
 AC_INIT(mpd, 0.14.0, musicpd-dev-team@lists.sourceforge.net)
-AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
+AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_SUBST(MPD_LIBS)