merge from trunk:

r5254 | tom | 2005-11-30 01:03:58 +0100 (Wed, 30 Nov 2005) | 2 lines
Automake 1.7 is required now.

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_1_BRANCH@5259

diff --git a/Makefile.am b/Makefile.am
index 6a0e9cdabafc26cf31d7fdeae34f36b99bdc4601..517834a88ced9b90efb901c453ecf5a256395ff6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-AUTOMAKE_OPTIONS = foreign 1.6 dist-bzip2
+AUTOMAKE_OPTIONS = foreign 1.7 dist-bzip2
 
 include $(top_srcdir)/Makefile.all.am