X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Fautogen.sh;h=419d8e7bb822a39a9bb67485ef67696a1620c925;hp=32526dd95979c0379dc8b5bc6cf2af5dacf492c0;hb=93e457796a1643a6ebf104ea1fc638d4add9e1b5;hpb=8050ee91bc4ef3653bae8d2e56f3612256a30cda

diff --git a/build/autogen.sh b/build/autogen.sh
index 32526dd..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,11 +105,11 @@ for dir in $OPTIONAL_DIRS; do
     fi
 done
 
-for AMVER in 1.7 1.8 1.9 1.10; do
+for AMVER in 1.7 1.8 1.9 1.10 1.11; do
      [ "$(which automake-$AMVER 2> /dev/null)" ] && break
 done
 
-[ "$AMVER" = "1.10" ] && AMOPT="-W no-portability"
+[ "${AMVER#1.}" -ge "10" ] && AMOPT="-W no-portability"
 
 check_version automake automake-$AMVER "1.7.8"
 check_version autoconf autoconf "2.57"