X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fautogen.sh;h=2e73f64025c3599f092e3101bd6827dc92deb922;hb=bf96e11de39be356d04de70a25726dc74dd99522;hp=b40645995630d7deb5c7360bfd2093a0d9954b0a;hpb=aaacd524b83c703686a5cbd35a1bd5ba4972330a;p=fs%2Flustre-release.git

diff --git a/build/autogen.sh b/build/autogen.sh
index b406459..2e73f64 100644
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -31,7 +31,7 @@ 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
 
@@ -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 lustre-iokit ldiskfs"
+    CONFIGURE_DIRS="libsysio lustre-iokit ldiskfs spl zfs"
 fi
 
 for dir in $REQUIRED_DIRS ; do
@@ -105,24 +105,40 @@ 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 autoheader..."
-autoheader || exit 1
-echo "Running automake-1.7..."
-automake-1.7 -a -c || exit 1
-echo "Running autoconf..."
-autoconf || exit 1
+run_cmd()
+{
+    cmd="$@"
+    echo -n "Running $cmd"
+    eval $cmd
+    res=$?
+    if [ $res -ne 0 ]; then
+        echo " failed: $res"
+        echo "Aborting"
+        exit 1
+    fi
+    echo
+}
+
+run_cmd "aclocal-$AMVER $ACLOCAL_FLAGS"
+run_cmd "autoheader"
+run_cmd "automake-$AMVER -a -c $AMOPT"
+run_cmd autoconf
 
 # 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 || exit $?
+        run_cmd "sh autogen.sh"
         popd >/dev/null
     fi
 done