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.
This commit is contained in:
Max Kellermann 2008-10-18 07:21:04 +02:00
parent eace565212
commit 90fdf07aa9
3 changed files with 3 additions and 3 deletions

View File

@ -1,5 +1,5 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign 1.6 AUTOMAKE_OPTIONS = foreign 1.9 dist-bzip2
SUBDIRS = src doc SUBDIRS = src doc
docs = README UPGRADING docs = README UPGRADING

View File

@ -16,7 +16,7 @@ if test -n "$AM_FORCE_VERSION"
then then
AM_VERSIONS="$AM_FORCE_VERSION" AM_VERSIONS="$AM_FORCE_VERSION"
else else
AM_VERSIONS='1.6 1.7 1.8 1.9' AM_VERSIONS='1.9 1.10'
fi fi
if test -n "$AC_FORCE_VERSION" if test -n "$AC_FORCE_VERSION"
then then

View File

@ -3,7 +3,7 @@ dnl AM_INIT_AUTOMAKE(mpd, 0.14.0)
AC_PREREQ(2.60) AC_PREREQ(2.60)
AC_INIT(mpd, 0.14.0, musicpd-dev-team@lists.sourceforge.net) 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_CONFIG_MACRO_DIR([m4])
AC_SUBST(MPD_LIBS) AC_SUBST(MPD_LIBS)