From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Fri, 9 Nov 2007 01:57:26 +0000 (+0000)
Subject: Accept automake 1.10, too
X-Git-Tag: GLIB_2_15_1~405
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6181cd47e23b3a09c91e6136adc30c493d8ad26e;p=platform%2Fupstream%2Fglib.git

Accept automake 1.10, too

svn path=/trunk/; revision=5831
---

diff --git a/ChangeLog b/ChangeLog
index c8da74e..40d00a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,12 @@
 2007-11-08  Matthias Clasen <mclasen@redhat.com>
+	
+	* autogen.sh: Accept automake 1.10, too
 
 	* mkinstalldirs: Temporarily add this script, to fix building
 	from svn.
 
-	* Makefile.am: Use MKDIRS_P instead of mkinstalldirs.
+	* Makefile.am: Use MKDIRS_P instead of mkinstalldirs, add
+	ChangeLog.pre-2-14 and mkinstalldirs to EXTRA_DIST.
 
 2007-11-08  Matthias Clasen <mclasen@redhat.com>
 
diff --git a/autogen.sh b/autogen.sh
index f866361..7e5885c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -48,13 +48,17 @@ fi
 if automake-1.9 --version < /dev/null > /dev/null 2>&1 ; then
     AUTOMAKE=automake-1.9
     ACLOCAL=aclocal-1.9
-else
+else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.10
+    ACLOCAL=aclocal-1.10
+else 
 	echo
-	echo "You must have automake 1.9.x installed to compile $PROJECT."
+	echo "You must have automake 1.9.x or 1.10.x installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
 	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
 	DIE=1
 fi
+fi
 
 if test "$DIE" -eq 1; then
 	exit 1