X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fautogen.sh;h=419d8e7bb822a39a9bb67485ef67696a1620c925;hb=ac8e871d781fae211feb88ff7e95aabb6ae48e68;hp=71c05e461398d2d6c6c43abbed9ee36b61866e16;hpb=cd9b18f3af19d4f3d05784cdd1d5356f5eaf3c9b;p=fs%2Flustre-release.git

diff --git a/build/autogen.sh b/build/autogen.sh
index 71c05e4..419d8e7 100644
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -85,7 +85,7 @@ if [ -d kernel_patches ] ; then
 else
     REQUIRED_DIRS="build libcfs lnet lustre"
     OPTIONAL_DIRS="snmp portals"
-    CONFIGURE_DIRS="libsysio lustre-iokit 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 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 || 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