[kaffe] CVS kaffe (robilad): TODO: Removed finished merge tasks, added gcj integration.

[Kaffe CVS]

PatchSet 7510 
Date: 2007/08/06 13:33:11
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
2007-08-06  Dalibor Topic  <robilad at kaffe.org>

        * TODO: Removed finished merge tasks, added gcj integration.

Members: 
	ChangeLog:1.5008->1.5009 
	configure:1.588->1.589 
	configure.ac:1.263->1.264 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5008 kaffe/ChangeLog:1.5009
--- kaffe/ChangeLog:1.5008	Mon Aug  6 12:58:42 2007
+++ kaffe/ChangeLog	Mon Aug  6 13:33:11 2007
@@ -1,5 +1,10 @@
 2007-08-06  Dalibor Topic  <robilad at kaffe.org>
 
+	* configure.ac: Mention configure.ac in copryght information.
+	(AM_INIT_AUTOMAKE): Require automake 1.10.
+
+2007-08-06  Dalibor Topic  <robilad at kaffe.org>
+
 	* TODO: Removed finished merge tasks, added gcj integration.
 
 2007-08-06  Dalibor Topic  <robilad at kaffe.org>
Index: kaffe/configure
diff -u kaffe/configure:1.588 kaffe/configure:1.589
--- kaffe/configure:1.588	Mon Aug  6 11:51:48 2007
+++ kaffe/configure	Mon Aug  6 13:33:11 2007
@@ -16,7 +16,7 @@
 # This file is part of Kaffe Virtual Machine, a free software runtime
 # for java applications. See http://www.kaffe.org for details.
 #
-# Parts of this configure script come from the `configure.in' file, and
+# Parts of this configure script come from the `configure.ac' file, and
 # are not based on freely-redistributable m4 macros; you can redistribute
 # them and/or modify them under the terms of the GNU General Public
 # as published by the Free Software Foundation; either version 2, or (at
@@ -1922,7 +1922,7 @@
 This file is part of Kaffe Virtual Machine, a free software runtime
 for java applications. See http://www.kaffe.org for details.
 
-Parts of this configure script come from the `configure.in' file, and
+Parts of this configure script come from the `configure.ac' file, and
 are not based on freely-redistributable m4 macros; you can redistribute
 them and/or modify them under the terms of the GNU General Public
 as published by the Free Software Foundation; either version 2, or (at
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.263 kaffe/configure.ac:1.264
--- kaffe/configure.ac:1.263	Mon Jul  2 03:46:37 2007
+++ kaffe/configure.ac	Mon Aug  6 13:33:12 2007
@@ -17,7 +17,7 @@
 This file is part of Kaffe Virtual Machine, a free software runtime
 for java applications. See http://www.kaffe.org for details.
 
-Parts of this configure script come from the `configure.in' file, and
+Parts of this configure script come from the `configure.ac' file, and
 are not based on freely-redistributable m4 macros; you can redistribute
 them and/or modify them under the terms of the GNU General Public
 as published by the Free Software Foundation; either version 2, or (at
@@ -33,7 +33,7 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ])
 
-AM_INIT_AUTOMAKE([1.9.6 dist-bzip2 dist-zip tar-ustar])
+AM_INIT_AUTOMAKE([1.10 dist-bzip2 dist-zip tar-ustar])
 
 AC_PREFIX_DEFAULT(/usr/local/kaffe)