Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0

aclocal    || (echo "Can't execute aclocal" && exit 1)

autoheader || (echo "Can't execute autoheader" && exit 1)

# --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)

else

  libtoolize --automake --force \

             || (echo "Can't execute libtoolize" && exit 1)

fi

# --add-missing instructs automake to install missing auxiliary files

# and --force to overwrite them if they already exist

automake --add-missing --force \