X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fautogen.sh;h=2e73f64025c3599f092e3101bd6827dc92deb922;hb=7418dd0d056ef994d4f84037e98da1f9e86de1d5;hp=419d8e7bb822a39a9bb67485ef67696a1620c925;hpb=49191c6512ce19340b21387abb035dbd75273396;p=fs%2Flustre-release.git

diff --git a/build/autogen.sh b/build/autogen.sh
index 419d8e7..2e73f64 100644
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -114,21 +114,31 @@ done
 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