Branch b_hd_kdmu

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

diff --git a/build/autogen.sh b/build/autogen.sh
index a47d390..70cada2 100644 (file)
--- 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:
 
@@ -83,9 +83,9 @@ if [ -d kernel_patches ] ; then
     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
@@ -105,15 +105,21 @@ 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; do
+     [ "$(which automake-$AMVER 2> /dev/null)" ] && break
+done
+
+[ "$AMVER" = "1.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 || exit 1
+echo "Running aclocal-$AMVER $ACLOCAL_FLAGS..."
+aclocal-$AMVER $ACLOCAL_FLAGS || exit 1
 echo "Running autoheader..."
 autoheader || exit 1
-echo "Running automake-1.7..."
-automake-1.7 -a -c || exit 1
+echo "Running automake-$AMVER..."
+automake-$AMVER -a -c $AMOPT || exit 1
 echo "Running autoconf..."
 autoconf || exit 1