diff options
| author | unknown <midom@flute.local> | 2006-05-09 16:24:57 +0300 |
|---|---|---|
| committer | unknown <midom@flute.local> | 2006-05-09 16:24:57 +0300 |
| commit | 6e50ee2a99a00d40b50bc971d38db50c9d56b69d (patch) | |
| tree | 69fa5b165d3ec55f584f5891f2522372db2f1f3d | |
| parent | 55f7266beedbac3a009b52c8fb6ba41fadd601e8 (diff) | |
| download | mariadb-git-6e50ee2a99a00d40b50bc971d38db50c9d56b69d.tar.gz | |
Fix InnoDB building on MacOSX when autorun.sh is used
BUILD/autorun.sh:
Add libtoolize/glibtoolize hook for InnoDB auto-stuff too
| -rwxr-xr-x | BUILD/autorun.sh | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/BUILD/autorun.sh b/BUILD/autorun.sh index 7a60464ae91..9ffe61b250a 100755 --- a/BUILD/autorun.sh +++ b/BUILD/autorun.sh @@ -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 |