mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

autorun.sh:

Browse source 
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)
This commit is contained in:
kent@mysql.com/kent-amd64.(none) 2007-10-29 20:12:44 +01:00
parent f85bf63ce7
commit 5218a5d033
2 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
BUILD/autorun.sh
View file

@ -3,20 +3,29 @@
die() { echo "$@"; exit 1; } die() { echo "$@"; exit 1; }
# Added glibtoolize reference to make native OSX autotools work # Added glibtoolize reference to make native OSX autotools work,
if [ -f /usr/bin/glibtoolize ] # 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 then
LIBTOOLIZE=glibtoolize LIBTOOLIZE=glibtoolize
else break
LIBTOOLIZE=libtoolize elif test -f $dir/libtoolize
fi then
break
fi
done
IFS="$save_ifs"
aclocal || die "Can't execute aclocal" aclocal || die "Can't execute aclocal"
autoheader || die "Can't execute autoheader" autoheader || die "Can't execute autoheader"
# --force means overwrite ltmain.sh script if it already exists # --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 # --add-missing instructs automake to install missing auxiliary files
# and --force to overwrite them if they already exist # 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" autoconf || die "Can't execute autoconf"

11
BUILD/compile-dist
View file

@ -7,14 +7,9 @@
# package" that is used as the basis for all other binary builds. # package" that is used as the basis for all other binary builds.
# #
test -f Makefile && make maintainer-clean test -f Makefile && make maintainer-clean
(cd storage/innobase && aclocal && autoheader && \
libtoolize --automake --force --copy && \ path=`dirname $0`
automake --force --add-missing --copy && autoconf) . $path/autorun.sh
aclocal
autoheader
libtoolize --automake --force --copy
automake --force --add-missing --copy
autoconf
# Default to gcc for CC and CXX # Default to gcc for CC and CXX
if test -z "$CXX" ; then if test -z "$CXX" ; then