X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fautogen.sh;h=419d8e7bb822a39a9bb67485ef67696a1620c925;hb=8d6f25d4483788b0baca9b4d623d81fc54489455;hp=49be95ef5d751dd03af0cbb0097685f893644b15;hpb=936860430ae90d65cf58cd15f278adb9e9a429db;p=fs%2Flustre-release.git

diff --git a/build/autogen.sh b/build/autogen.sh
index 49be95e..419d8e7 100644
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -31,11 +31,11 @@ error_msg() {
 		EOF
 	else
 		cat >&2 <<-EOF
-		CFS provides RPMs which can be installed alongside your
+		Sun provides RPMs which can be installed alongside your
 		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 spl zfs"
 fi
 
 for dir in $REQUIRED_DIRS ; do
@@ -104,24 +105,30 @@ for dir in $OPTIONAL_DIRS; do
     fi
 done
 
-check_version automake automake-1.7 "1.7.8"
+for AMVER in 1.7 1.8 1.9 1.10 1.11; do
+     [ "$(which automake-$AMVER 2> /dev/null)" ] && break
+done
+
+[ "${AMVER#1.}" -ge "10" ] && AMOPT="-W no-portability"
+
+check_version automake automake-$AMVER "1.7.8"
 check_version autoconf autoconf "2.57"
 
-echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
-aclocal-1.7 $ACLOCAL_FLAGS
+echo "Running aclocal-$AMVER $ACLOCAL_FLAGS..."
+aclocal-$AMVER $ACLOCAL_FLAGS || exit 1
 echo "Running autoheader..."
-autoheader
-echo "Running automake-1.7..."
-automake-1.7 -a -c
+autoheader || exit 1
+echo "Running automake-$AMVER..."
+automake-$AMVER -a -c $AMOPT || 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