X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fautogen.sh;h=94e9ad3e84970250d70aeaf7e1e67249fa71f680;hb=63addaf03f9fdcd5a3b7a04d64e86bd8eaba2c95;hp=3c3bf5f6869c300ad9c9b91d7dd981ea6397ac0d;hpb=f64af1d45df2a76f97337b47259363f61fab6b5f;p=fs%2Flustre-release.git

diff --git a/build/autogen.sh b/build/autogen.sh
index 3c3bf5f..94e9ad3 100644
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -39,7 +39,7 @@ error_msg() {
 
 		You may be able to download newer version from:
 
-		http://ftp.gnu.org/gnu/$cmd/$cmd-$required.tar.gz
+		http://ftp.gnu.org/gnu/$tool/$tool-$required.tar.gz
 	EOF
 	fi
 	[ "$cmd" = "autoconf" -a "$required" = "2.57" ] && cat >&2 <<EOF
@@ -70,7 +70,7 @@ check_version() {
     if ! $cmd --version >/dev/null ; then
 	error_msg "missing"
     fi
-    version=$($cmd --version | awk "BEGIN { IGNORECASE=1 } /$tool \(GNU $tool\)/ { print \$4 }")
+    version=$($cmd --version | awk "/$tool \(GNU/ { print \$4 }")
     echo "found $version"
     if ! compare_versions "$required" "$version" ; then
 	error_msg "too old"
@@ -78,7 +78,8 @@ check_version() {
 }
 
 echo "Checking for a complete tree..."
-for dir in build portals lustre ; do
+# required directories
+for dir in build lnet lustre ; do
     if [ ! -d "$dir" ] ; then
 	cat >&2 <<EOF
 Your tree seems to be missing $dir.
@@ -88,6 +89,12 @@ EOF
     fi
     ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
 done
+# some are optional
+for dir in snmp portals; do
+    if [ -d "$dir" ] ; then
+	ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
+    fi
+done
 
 check_version automake automake-1.7 "1.7.8"
 check_version autoconf autoconf "2.57"