Require automake 1.11

("It is more than a year old")

diff --git a/Makefile.am b/Makefile.am
index d3ec3fe5a9a50b98f4b65a0a47da9bb8921cb464..8cd2199f14fb0598713f1b4e25a496aa49d30880 100644 (file)
--- 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 8a8701ea7ae5620a7132685e982418aa12edb963..1c9d115fbd470d35eb77882b4e8dcbe41861ff59 100644 (file)
--- 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