diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-10-29 20:12:44 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-10-29 20:12:44 +0100 |
| commit | 1b261d3d6161d3d833183bdf12f87dee0c48ff14 (patch) | |
| tree | e030a0dd57d87188819864b3e5fe2b65d41d118b /BUILD | |
| parent | dfdcaf5f01864d46b9ee95bd3c8c8e34887618dc (diff) | |
| download | mariadb-git-1b261d3d6161d3d833183bdf12f87dee0c48ff14.tar.gz | |
autorun.sh:
Removed innobase from compile-dist, and let it use autorun.sh to avoid
code duplication. Also corrected a problem when searching for one of
"libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)
BUILD/autorun.sh:
Removed innobase from compile-dist, and let it use autorun.sh to avoid
code duplication. Also corrected a problem when searching for one of
"libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/autorun.sh | 23 | ||||
| -rwxr-xr-x | BUILD/compile-dist | 11 |
2 files changed, 19 insertions, 15 deletions
diff --git a/BUILD/autorun.sh b/BUILD/autorun.sh index def229e21a0..a1b1998482e 100755 --- a/BUILD/autorun.sh +++ b/BUILD/autorun.sh @@ -3,20 +3,29 @@ die() { echo "$@"; exit 1; } -# Added glibtoolize reference to make native OSX autotools work -if [ -f /usr/bin/glibtoolize ] +# Added glibtoolize reference to make native OSX autotools work, +# we pick the first of glibtoolize/libtoolize we find in PATH +LIBTOOLIZE=libtoolize # Default +IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' +for dir in $PATH +do + if test -f $dir/glibtoolize then LIBTOOLIZE=glibtoolize - else - LIBTOOLIZE=libtoolize -fi + break + elif test -f $dir/libtoolize + then + break + fi +done +IFS="$save_ifs" aclocal || die "Can't execute aclocal" autoheader || die "Can't execute autoheader" # --force means overwrite ltmain.sh script if it already exists -$LIBTOOLIZE --automake --force || die "Can't execute libtoolize" +$LIBTOOLIZE --automake --force --copy || die "Can't execute libtoolize" # --add-missing instructs automake to install missing auxiliary files # and --force to overwrite them if they already exist -automake --add-missing --force || die "Can't execute automake" +automake --add-missing --force --copy || die "Can't execute automake" autoconf || die "Can't execute autoconf" diff --git a/BUILD/compile-dist b/BUILD/compile-dist index 2da2259a3f7..d9103e0a419 100755 --- a/BUILD/compile-dist +++ b/BUILD/compile-dist @@ -7,14 +7,9 @@ # package" that is used as the basis for all other binary builds. # test -f Makefile && make maintainer-clean -(cd storage/innobase && aclocal && autoheader && \ - libtoolize --automake --force --copy && \ - automake --force --add-missing --copy && autoconf) -aclocal -autoheader -libtoolize --automake --force --copy -automake --force --add-missing --copy -autoconf + +path=`dirname $0` +. $path/autorun.sh # Default to gcc for CC and CXX if test -z "$CXX" ; then |