build: Properly require automake-1.11

diff --git a/autogen.sh b/autogen.sh
index cc056c2..7f5f354 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,6 +6,9 @@ which gnome-autogen.sh || {
 }
 
 mkdir -p m4
+
+# require automak 1.11 for vala support
+export REQUIRED_AUTOMAKE_VERSION=1.11
 gnome-autogen.sh --enable-vala --enable-maintainer-mode --enable-debug \
                  --enable-test-plugin --enable-mediathek-plugin \
                  --enable-gst-launch-plugin "$@"

diff --git a/configure.ac b/configure.ac
index 8e99603..7c39037 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,7 @@ AC_INIT([rygel],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=Rygel])
 AC_CONFIG_AUX_DIR([build-aux])
 
-# require automake-1.11 for vala support
-AM_INIT_AUTOMAKE([1.11])
+AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/rygel/rygel-root-device.vala])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])