b=20744 hacks for Novell bug 639581

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

diff --git a/build/autogen.sh b/build/autogen.sh
index 70cada2..2e73f64 100644 (file)
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -105,30 +105,40 @@ 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"
 
-echo "Running aclocal-$AMVER $ACLOCAL_FLAGS..."
-aclocal-$AMVER $ACLOCAL_FLAGS || exit 1
-echo "Running autoheader..."
-autoheader || exit 1
-echo "Running automake-$AMVER..."
-automake-$AMVER -a -c $AMOPT || 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