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.

Makefile.am: require automake 1.9
90fdf07a · Max Kellermann · eace5652 · 90fdf07a · 90fdf07a · 90fdf07a
Commit 90fdf07a authored Oct 18, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Makefile.am Makefile.am +1 -1

autogen.sh autogen.sh +1 -1

configure.ac configure.ac +1 -1

No files found.
--- a/Makefile.am
+++ b/Makefile.am
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign 1.6
+AUTOMAKE_OPTIONS = foreign 1.9 dist-bzip2

 SUBDIRS = src doc
 docs = README UPGRADING

--- 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

--- 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)