merge

1 files changed, 9 insertions, 9 deletions

diff --git a/BUILD/autorun.sh b/BUILD/autorun.sh
index 8e4ef85657e..82fd1722bd0 100755
--- a/BUILD/autorun.sh
+++ b/BUILD/autorun.sh
@@ -1,21 +1,21 @@
 #!/bin/sh
 # Create MySQL autotools infrastructure
 
-aclocal    || (echo "Can't execute aclocal" && exit 1)
-autoheader || (echo "Can't execute autoheader" && exit 1)
+die() { echo "$@"; exit 1; }
+
+aclocal || die "Can't execute aclocal" 
+autoheader || die "Can't execute autoheader"
 # --force means overwrite ltmain.sh script if it already exists 
 # Added glibtoolize reference to make native OSX autotools work
 if [ -f /usr/bin/glibtoolize ] ; then
-  glibtoolize --automake --force \
-             || (echo "Can't execute glibtoolize" && exit 1)
+  glibtoolize --automake --force || die "Can't execute glibtoolize"
 else
-  libtoolize --automake --force \
-             || (echo "Can't execute libtoolize" && exit 1)
+  libtoolize --automake --force || die "Can't execute libtoolize"
 fi
+  
 # --add-missing instructs automake to install missing auxiliary files
 # and --force to overwrite them if they already exist
-automake --add-missing --force \
-           || (echo "Can't execute automake" && exit 1)
-autoconf   || (echo "Can't execute autoconf" && exit 1)
+automake --add-missing --force || die "Can't execute automake"
+autoconf || die "Can't execute autoconf"
 (cd storage/bdb/dist && sh s_all)
 (cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)