From fdbe952ae6488dbe2cd2c3fb884975ad86ad8e37 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Fri, 23 Apr 2004 22:00:30 +0000
Subject: [PATCH] Check if the autolustre RPMs are already installed, and
 suggest changing the PATH, so I (and other users) don't have to remember
 where they are.

---
 lustre/autogen.sh | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/lustre/autogen.sh b/lustre/autogen.sh
index c7588e4..004852e 100644
--- a/lustre/autogen.sh
+++ b/lustre/autogen.sh
@@ -19,26 +19,38 @@ compare_versions() {
 }
 
 error_msg() {
-	cat >&2 <<EOF
-$cmd is $1.  version $required is required to build Lustre.
+	echo "$cmd is $1.  version $required is required to build Lustre."
 
-CFS provides RPMs which can be installed alongside your existing autoconf/make
-RPMs, if you are nervous about upgrading.  See
+	if [ -e /usr/lib/autolustre/bin/$cmd ]; then
+		cat >&2 <<-EOF
+		You apparently already have Lustre-specific autoconf/make RPMs
+		installed on your system at /usr/lib/autolustre/share/$cmd.
+		Please set your PATH to point to those versions:
 
-ftp://ftp.lustre.org/pub/other/autolustre/README.autolustre
+		export PATH="/usr/lib/autolustre/bin:\$PATH"
+		EOF
+	else
+		cat >&2 <<-EOF
+		CFS provides RPMs which can be installed alongside your
+		existing autoconf/make RPMs, if you are nervous about
+		upgrading.  See
 
-You may be able to download a new version from:
-http://ftp.gnu.org/gnu/$cmd/$cmd-$required.tar.gz
-EOF
+		ftp://ftp.lustre.org/pub/other/autolustre/README.autolustre
+
+		You may be able to download newer version from:
+
+		http://ftp.gnu.org/gnu/$cmd/$cmd-$required.tar.gz
+	EOF
+	fi
 	[ "$cmd" = "autoconf" -a "$required" = "2.57" ] && cat >&2 <<EOF
 
-or
+or for RH9 systems you can use:
 
 ftp://fr2.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm
 EOF
 	[ "$cmd" = "automake" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
 
-or
+or for RH9 systems you can use:
 
 ftp://fr2.rpmfind.net/linux/fedora/core/1/i386/os/Fedora/RPMS/automake-1.7.8-1.noarch.rpm
 EOF
-- 
1.8.3.1