From: Dirk Mueller <daywalker@users.sourceforge.net>
Date: Thu, 1 Dec 2005 10:03:23 +0000 (+0000)
Subject: merge from trunk:
X-Git-Tag: svn/VALGRIND_3_1_1~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be5c14f75674f1beec56dcc35692e3b29fa9a0e5;p=thirdparty%2Fvalgrind.git

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 6a0e9cdaba..517834a88c 100644
--- 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