From c4c6a6de42034c450ea11d1072b372f5d2776ae7 Mon Sep 17 00:00:00 2001
From: Mikhail Pershin <tappro@sun.com>
Date: Tue, 21 Sep 2010 18:30:09 +0400
Subject: [PATCH] b=23074 improve autogen.sh

o=Bernd Schubert
i=adilger
i=brianm
---
 build/autogen.sh | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

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
-- 
1.8.3.1