patch by: David Nečas <yeti@physics.muni.cz>

	* autogen.sh:
	  Accepts automake 1.10 too. Fixes #459225


svn path=/trunk/; revision=463

2 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 3cb7d27..efe87e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-08-11  Stefan Kost  <ensonic@users.sf.net>
 
+	patch by: David Nečas <yeti@physics.muni.cz>
+
+	* autogen.sh:
+	  Accepts automake 1.10 too. Fixes #459225
+
+2007-08-11  Stefan Kost  <ensonic@users.sf.net>
+
 	* gtkdoc-mkdb.in:
 	  Make the tmpl-less build work.
 
diff --git a/autogen.sh b/autogen.sh
index 4bcbd99..91687d7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -27,7 +27,10 @@ cd "$srcdir"
 	DIE=1
 }
 
-if automake-1.9 --version < /dev/null > /dev/null 2>&1; then
+if automake-1.10 --version < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake-1.10
+    ACLOCAL=aclocal-1.10
+elif automake-1.9 --version < /dev/null > /dev/null 2>&1; then
     AUTOMAKE=automake-1.9
     ACLOCAL=aclocal-1.9
 elif automake-1.8 --version < /dev/null > /dev/null 2>&1; then