From: Rémi Denis-Courmont <remi@remlab.net>
Date: Wed, 21 Jul 2010 15:19:17 +0000 (+0300)
Subject: Require automake 1.11
X-Git-Tag: 1.2.0-pre1~5732^2~1
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=393a1b3308030682a3d670bb2865f5be8ce8cea7;p=vlc

Require automake 1.11

("It is more than a year old")
---

diff --git a/Makefile.am b/Makefile.am
index d3ec3fe5a9..8cd2199f14 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,7 +103,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = \
-	1.9 \
+	1.11 \
 	-Wall \
 	check-news \
 	dist-bzip2 \
diff --git a/configure.ac b/configure.ac
index 8a8701ea7a..1c9d115fbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,6 @@ CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="Twoflower"
 COPYRIGHT_YEARS="1996-2010"
 
-AC_PREREQ(2.59c)
 AC_CONFIG_SRCDIR(src/libvlc.c)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CONFIG_MACRO_DIR(m4)
@@ -27,13 +26,7 @@ AM_INIT_AUTOMAKE(tar-ustar)
 AM_CONFIG_HEADER(config.h)
 
 # Disable with "./configure --disable-silent-rules" or "make V=1"
-m4_ifdef([AM_SILENT_RULES], [
-  AM_SILENT_RULES([yes])
-], [
-  AM_DEFAULT_VERBOSITY=1
-  AC_SUBST(AM_DEFAULT_VERBOSITY)
-])
-
+AM_SILENT_RULES([yes])
 
 dnl Too many people are not aware of maintainer mode:
 dnl If you want to use it, you definitely know what you are doing, so