Branch b1_4

[fs/lustre-release.git] / build / autogen.sh

diff --git a/build/autogen.sh b/build/autogen.sh
index 3c3bf5f..e32e26a 100644 (file)
--- 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 ; 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"