aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-10-09 16:04:09 +0200
committerMax Kellermann <max@duempel.org>2011-10-09 18:32:55 +0200
commit176debaf374b248ac098ac46877938c60ac7f7c8 (patch)
tree4a3bdf554e85a583f1f8f14018317cbf4ae0b5c4
parent072f83b2409a3441207145794ba1cd7f4fd13f3a (diff)
downloadmpd-176debaf374b248ac098ac46877938c60ac7f7c8.tar.gz
mpd-176debaf374b248ac098ac46877938c60ac7f7c8.tar.xz
mpd-176debaf374b248ac098ac46877938c60ac7f7c8.zip
Makefile.am: require automake 1.11
Prepare for enabling "silent-rules".
-rw-r--r--Makefile.am2
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index c8c34941c..d11e14910 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 subdir-objects
+AUTOMAKE_OPTIONS = foreign 1.11 dist-bzip2 subdir-objects
AM_CPPFLAGS += -I$(srcdir)/src $(GLIB_CFLAGS)
diff --git a/autogen.sh b/autogen.sh
index 28a89c674..f163e35a7 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.11 1.10'
+ AM_VERSIONS='1.11'
fi
if test -n "$AC_FORCE_VERSION"
then
diff --git a/configure.ac b/configure.ac
index adee0de0e..a3d25529d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
AC_PREREQ(2.60)
AC_INIT(mpd, 0.17~git, musicpd-dev-team@lists.sourceforge.net)
AC_CONFIG_SRCDIR([src/main.c])
-AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([foreign 1.11 dist-bzip2 subdir-objects])
AM_CONFIG_HEADER(config.h)
AC_CONFIG_MACRO_DIR([m4])