Move automake options to Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 80807c20690ff668c4422d489f88eaf597fdc3b4..85eef7d37b34851735a80b942059449577d87d1b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,13 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
        --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2
 
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = \
+       1.9 \
+       -Wall \
+       check-news \
+       std-options \
+       dist-bzip2 \
+       no-dist-gzip
 
 ###############################################################################
 # MacOS X project

diff --git a/configure.ac b/configure.ac
index 3f1678f78b691f7d1f815a0101c188980ab50d15..1a5cf3c335b26d0d0751bad279aed282a2bd9ed4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.9 check-news dist-bzip2 no-dist-gzip -Wall])
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 
 dnl Too many people are not aware of maintainer mode: