diff options
author | unknown <brian@zim.(none)> | 2006-08-23 13:59:16 -0700 |
---|---|---|
committer | unknown <brian@zim.(none)> | 2006-08-23 13:59:16 -0700 |
commit | fb47d6581bb07cca94add40815481d59bfda532e (patch) | |
tree | eebdd5120d105133e8d7c26dfd74bec1844c7998 /BUILD | |
parent | 977cd20a70d0d4ca9058d2b287baf12c64dc19fa (diff) | |
download | mariadb-git-fb47d6581bb07cca94add40815481d59bfda532e.tar.gz |
This patch removes need for a innodb to have its own configure.
BitKeeper/deleted/.del-configure.in:
Delete: storage/innobase/configure.in
BUILD/FINISH.sh:
Removed work for Innodb's configure
BUILD/autorun.sh:
Removed pieces for Innodb's build
storage/innobase/Makefile.am:
Removed ib_config.h needs
storage/innobase/include/Makefile.i:
Expanded includes.
storage/innobase/include/univ.i:
Removed ib_config need
storage/innobase/plug.in:
Added support taken from configure.in for building Innodb
Diffstat (limited to 'BUILD')
-rw-r--r-- | BUILD/FINISH.sh | 2 | ||||
-rwxr-xr-x | BUILD/autorun.sh | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 51f6e909172..b141a15068a 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -5,7 +5,7 @@ configure="./configure $base_configs $extra_configs" commands="\ $make -k distclean || true -/bin/rm -rf */.deps/*.P config.cache storage/innobase/config.cache autom4te.cache innobase/autom4te.cache; +/bin/rm -rf */.deps/*.P config.cache autom4te.cache; path=`dirname $0` . \"$path/autorun.sh\"" diff --git a/BUILD/autorun.sh b/BUILD/autorun.sh index 337f43512fa..def229e21a0 100755 --- a/BUILD/autorun.sh +++ b/BUILD/autorun.sh @@ -11,10 +11,6 @@ if [ -f /usr/bin/glibtoolize ] LIBTOOLIZE=libtoolize fi -(cd storage/innobase && aclocal && autoheader && \ - $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 |