Skip to content

M
mpd
Commit 90fdf07a authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

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.
parent eace5652
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
Makefile.am
View file @ 90fdf07a
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
......
autogen.sh
View file @ 90fdf07a
...@@ -16,7 +16,7 @@ if test -n "$AM_FORCE_VERSION" ...@@ -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
......
configure.ac
View file @ 90fdf07a
...@@ -3,7 +3,7 @@ dnl AM_INIT_AUTOMAKE(mpd, 0.14.0) ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment