Branch HEAD

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

diff --git a/build/autogen.sh b/build/autogen.sh
index 49be95e..5d77897 100644 (file)
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -35,7 +35,7 @@ error_msg() {
                existing autoconf/make RPMs, if you are nervous about
                upgrading.  See
 
-               ftp://ftp.lustre.org/pub/other/autolustre/README.autolustre
+               http://downloads.lustre.org/public/tools/autolustre/README.autolustre
 
                You may be able to download newer version from:
 
@@ -81,10 +81,11 @@ echo "Checking for a complete tree..."
 if [ -d kernel_patches ] ; then
     # This is ldiskfs
     REQUIRED_DIRS="build"
+    CONFIGURE_DIRS=""
 else
-    REQUIRED_DIRS="build lnet lustre"
+    REQUIRED_DIRS="build libcfs lnet lustre"
     OPTIONAL_DIRS="snmp portals"
-    CONFIGURE_DIRS="libsysio ldiskfs"
+    CONFIGURE_DIRS="libsysio lustre-iokit ldiskfs"
 fi
 
 for dir in $REQUIRED_DIRS ; do
@@ -108,20 +109,20 @@ check_version automake automake-1.7 "1.7.8"
 check_version autoconf autoconf "2.57"
 
 echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
-aclocal-1.7 $ACLOCAL_FLAGS
+aclocal-1.7 $ACLOCAL_FLAGS || exit 1
 echo "Running autoheader..."
-autoheader
+autoheader || exit 1
 echo "Running automake-1.7..."
-automake-1.7 -a -c
+automake-1.7 -a -c || exit 1
 echo "Running autoconf..."
-autoconf
+autoconf || exit 1
 
 # Run autogen.sh in these directories
 for dir in $CONFIGURE_DIRS; do
     if [ -d $dir ] ; then
         pushd $dir >/dev/null
         echo "Running autogen for $dir..."
-        sh autogen.sh
+        sh autogen.sh || exit $?
         popd >/dev/null
     fi
 done