bk commit into 5.1 tree (midom:1.2394)

[Domas Mituzas]

Below is the list of changes that have just been committed into a local
5.1 repository of midom. When midom 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.2394 06/05/09 16:24:57 midom@stripped +1 -0
  Fix InnoDB building on MacOSX when autorun.sh is used

  BUILD/autorun.sh
    1.9 06/05/09 16:24:46 midom@stripped +10 -7
    Add libtoolize/glibtoolize hook for InnoDB auto-stuff too

# 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:	midom
# Host:	flute.local
# Root:	/Users/midom/Development/mysql-5.1-new

--- 1.8/BUILD/autorun.sh	2006-05-09 01:14:34 +03:00
+++ 1.9/BUILD/autorun.sh	2006-05-09 16:24:46 +03:00
@@ -3,20 +3,23 @@
 
 die() { echo "$@"; exit 1; }
 
+# Added glibtoolize reference to make native OSX autotools work
+if [ -f /usr/bin/glibtoolize ]
+  then
+    LIBTOOLIZE=glibtoolize
+  else
+    LIBTOOLIZE=libtoolize
+fi
+
 (cd storage/bdb/dist && sh s_all)
 (cd storage/innobase && aclocal && autoheader && \
-    libtoolize --automake --force --copy && \
+    $LIBTOOLIZE --automake --force --copy && \
     automake --force --add-missing --copy && autoconf)
 
 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 test -f /usr/bin/glibtoolize  ; then
-  glibtoolize --automake --force || die "Can't execute glibtoolize"
-else
-  libtoolize --automake --force || die "Can't execute libtoolize"
-fi
+$LIBTOOLIZE --automake --force || die "Can't execute libtoolize"
   
 # --add-missing instructs automake to install missing auxiliary files
 # and --force to overwrite them if they already exist