bk commit into 5.0 tree (brian:1.1904)

[Brian Aker]

Below is the list of changes that have just been committed into a local
5.0 repository of brian. When brian does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1904 05/07/11 09:52:19 brian@stripped +1 -0
  Added a test for glibtoolize so that the autoconf tools that come installed on OSX will work fine (so no need to replace them). 

  BUILD/autorun.sh
    1.2 05/07/11 09:51:56 brian@stripped +8 -2
    Added a test for glibtoolize. This will fix issues with compiling on OSX

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	brian
# Host:	brian-akers-computer.local
# Root:	/Users/brian/mysql/comment-5.0

--- 1.1/BUILD/autorun.sh	2005-05-18 04:23:13 -07:00
+++ 1.2/BUILD/autorun.sh	2005-07-11 09:51:56 -07:00
@@ -4,8 +4,14 @@
 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 
-libtoolize --automake --force \
-           || (echo "Can't execute libtoolize" && exit 1)
+# 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 \