Index: INSTALL
===================================================================
RCS file: /cvsroot/classpath/classpath/INSTALL,v
retrieving revision 1.21
diff -u -b -B -r1.21 INSTALL
--- INSTALL	25 Jul 2004 20:58:25 -0000	1.21
+++ INSTALL	29 Jul 2004 19:23:09 -0000
@@ -20,8 +20,8 @@
         aclocal.m4, or config.h.in.
 
         - GNU autoconf 2.59+
-        - GNU automake 1.7+
-        - GNU libtool 1.4.2+
+        - GNU automake 1.9+
+        - GNU libtool 1.5+
 
 	When working from CVS you can run the above tools by executing
 	./autogen.sh in the source directory.
Index: autogen.sh
===================================================================
RCS file: /cvsroot/classpath/classpath/autogen.sh,v
retrieving revision 1.5
diff -u -b -B -r1.5 autogen.sh
--- autogen.sh	20 Apr 2004 11:55:26 -0000	1.5
+++ autogen.sh	29 Jul 2004 19:23:09 -0000
@@ -1,52 +1,101 @@
 #!/bin/sh
+# Run this to generate all the initial makefiles, etc.
 
-set -e
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
 
-LIBTOOLIZE=libtoolize
-${LIBTOOLIZE} --version | head -1
-echo "libtoolize: minimum version required: 1.4.2"
+ORIGDIR=`pwd`
+cd $srcdir
+PROJECT=classpath
+TEST_TYPE=-f
+FILE=java/lang/System.java
+
+DIE=0
+
+have_libtool=false
+if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
+	libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+	case $libtool_version in
+	    1.5*)
+		have_libtool=true
+		;;
+	esac
+fi
+if $have_libtool ; then : ; else
+	echo
+	echo "You must have libtool 1.5 installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
+	DIE=1
+fi
 
-AUTOCONF=autoconf
-${AUTOCONF} --version | head -1
-echo "autoconf: minimum version required: 2.59"
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have autoconf installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
+	DIE=1
+}
+
+if automake-1.9 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.9
+    ACLOCAL=aclocal-1.9
+else
+	echo
+	echo "You must have automake 1.9 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
 
-# Autoheader is part of autoconf
-AUTOHEADER=autoheader
-${AUTOHEADER} --version | head -1
-echo "autoheader: minimum version required: 2.59"
+if test "$DIE" -eq 1; then
+	exit 1
+fi
 
-AUTOMAKE=automake
-if test -x /usr/bin/automake-1.8; then
-  AUTOMAKE=/usr/bin/automake-1.8
-elif test -x /usr/bin/automake-1.7; then
-  AUTOMAKE=/usr/bin/automake-1.7
+test $TEST_TYPE $FILE || {
+	echo "You must run this script in the top-level $PROJECT directory"
+	exit 1
+}
+
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+        if test -z "$*"; then
+                echo "I am going to run ./configure with no arguments - if you wish "
+                echo "to pass any to it, please specify them on the $0 command line."
+        fi
 fi
-${AUTOMAKE} --version | head -1
-echo "automake: minimum version required: 1.7.0"
 
-# Aclocal is part of automake
-ACLOCAL=aclocal
-if test -x /usr/bin/aclocal-1.8; then
-  ACLOCAL=/usr/bin/aclocal-1.8
-elif test -x /usr/bin/aclocal-1.7; then
-  ACLOCAL=/usr/bin/aclocal-1.7
+if test -z "$ACLOCAL_FLAGS"; then
+
+	acdir=`$ACLOCAL --print-ac-dir`
+        m4list=""
+
+	for file in $m4list
+	do
+		if [ ! -f "$acdir/$file" ]; then
+			echo "WARNING: aclocal's directory is $acdir, but..."
+			echo "         no file $acdir/$file"
+			echo "         You may see fatal macro warnings below."
+			echo "         If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
+			echo "         environment variable to \"-I /some/dir\", or install"
+			echo "         $acdir/$file."
+			echo ""
+		fi
+	done
 fi
-${ACLOCAL} --version | head -1
-echo "aclocal: minimum version required: 1.7.0"
 
-echo "libtoolize ..."
-${LIBTOOLIZE} --force --copy
+$ACLOCAL $ACLOCAL_FLAGS || exit $?
 
-echo "aclocal ..."
-${ACLOCAL} -I .
+libtoolize --force || exit $?
 
-echo "autoheader ..."
-${AUTOHEADER} --force
+autoheader || exit $?
 
-echo "automake ..."
-${AUTOMAKE} --add-missing --copy
+$AUTOMAKE --add-missing || exit $?
+autoconf || exit $?
+cd $ORIGDIR || exit $?
 
-echo "autoconf ..."
-${AUTOCONF} --force
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+        $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
 
-echo "Finished"
+        echo 
+        echo "Now type 'make' to compile $PROJECT."
+fi
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.42
diff -u -b -B -r1.42 configure.ac
--- configure.ac	28 Jul 2004 23:20:44 -0000	1.42
+++ configure.ac	29 Jul 2004 19:23:09 -0000
@@ -25,7 +25,7 @@
 AC_SUBST(CLASSPATH_MODULE)
 
 AC_PREREQ(2.59)
-AM_INIT_AUTOMAKE(1.7.0)
+AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar])
 AC_CONFIG_HEADERS([include/config.h])
 AC_PREFIX_DEFAULT(/usr/local/classpath)