[babl] build: Set automake options in AM_INIT_AUTOMAKE

[Javier JardÃn <jjardon src gnome org>]

commit 45d8541c24f9437dc34bb6bfbe454a55f7365c88
Author: Javier JardÃn <jjardon gnome org>
Date:   Mon Oct 17 13:36:42 2011 +0100

    build: Set automake options in AM_INIT_AUTOMAKE

 Makefile.am  |    1 -
 configure.ac |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9566764..f8859a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
-AUTOMAKE_OPTIONS = foreign dist-bzip2
 
 SUBDIRS = \
 	babl		\
diff --git a/configure.ac b/configure.ac
index 07bde9d..9bb8bc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,7 +105,7 @@ AC_SUBST(BABL_CURRENT_MINUS_AGE)
 
 dnl ==========================================================================
 
-AM_INIT_AUTOMAKE(no-define no-dist-gzip -Wno-portability)
+AM_INIT_AUTOMAKE([1.10 foreign no-define dist-bzip2 no-dist-gzip -Wno-portability])
 
 # Enable silent build rules by default, requires at least
 # Automake-1.11. Disable by either passing --disable-silent-rules to