-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