config: Set automake options consistenly in one location

Avoid use of two manners of setting automake configuration options,
and consolidate them into AM_INIT_AUTOMAKE macro.

Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 631c845ab2240acc63e38743f11ad7ecdfd37786..a63cd9bdec8c79ae8933e5873c20ef2f7ec713b1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2
+AUTOMAKE_OPTIONS = 1.10
 
 include $(top_srcdir)/Makefile.all.am 
 

diff --git a/configure.ac b/configure.ac
index b69935e9bfacefaab4d64ce485a3a679a0096544..d0b68b46be0261d5db845f28e1581a1266931aa9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@
 AC_INIT([Valgrind],[3.15.0.GIT],[valgrind-users@lists.sourceforge.net])
 AC_CONFIG_SRCDIR(coregrind/m_main.c)
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
 
 AM_MAINTAINER_MODE