- minor fixes and documentation for the update to automake 1.5

 - currently, "make distcheck" fails - this needs to be investigated
   before the next release


Docs/manual.texi:
   - Updated toolchain version numbers
config.guess:
   - removed explicit setting of VENDOR=suse on SuSE systems

2 files changed, 5 insertions, 5 deletions

diff --git a/Docs/manual.texi b/Docs/manual.texi
index 37a8f31918e..f24f9ce5eb2 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -6986,10 +6986,8 @@ The initial download of the source tree may take a while, depending on the
 speed of your connection; be patient.
 
 @item
-You will need GNU @code{autoconf 2.52}, @code{automake 1.4},
-@code{libtool}, and @code{m4} to run the next set of commands.
-
-@code{automake} (1.5) doesn't yet work.
+You will need GNU @code{autoconf 2.52}, @code{automake 1.5},
+@code{libtool 1.4}, and @code{m4} to run the next set of commands.
 
 @example
 shell> cd mysql-4.0
@@ -50800,6 +50798,9 @@ each individual 4.0.x release.
 @appendixsubsec Changes in release 4.0.5
 @itemize
 @item
+Updated source tree to be built using @code{automake 1.5} and 
+@code{libtool 1.4}.
+@item
 Fixed bug with caching system database ('mysql'). Now query to system 
 database is not cached by query cache.
 @item
diff --git a/config.guess b/config.guess
index 6ead80a00a2..27ccc69772b 100755
--- a/config.guess
+++ b/config.guess
@@ -131,7 +131,6 @@ case "${UNAME_MACHINE}" in
 	test -z "$VENDOR" && VENDOR=unknown
 	;;
 esac
-test -f /etc/SuSE-release && VENDOR=suse
 
 # Note: order is significant - the case branches are not exclusive.