summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild-tools/Do-all-build-steps20
1 files changed, 6 insertions, 14 deletions
diff --git a/Build-tools/Do-all-build-steps b/Build-tools/Do-all-build-steps
index 2938edf2b01..18fdc770393 100755
--- a/Build-tools/Do-all-build-steps
+++ b/Build-tools/Do-all-build-steps
@@ -37,7 +37,7 @@ bk export $BD
cd "$BD"
chmod -R u+rw,g+rw .
-#Make it easy to remove an old build
+# Make it easy to remove an old build
umask 002
CC=$cc CXX=$ccc
@@ -49,29 +49,21 @@ rm -f NEW-RPMS/*
# Stop on error
set -e
-# Make everything readable for user and group
-# chmod -R u+rw,g+rw .
-
/bin/rm -f */.deps/*.P
/bin/rm -f config.cache
aclocal; autoheader; aclocal; automake; autoconf
-cd innobase
-aclocal; autoheader; aclocal; automake; autoconf
-cd ..
-
-# Since we have moved the configure.in stuff from readline to the
-# toplevel why do this? David 990630
-# (cd readline; aclocal; autoheader; aclocal; automake; autoconf)
+(cd bdb/dist && sh s_all)
+(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
-# A normal user starts here. We must use mit-threads. Otherwise it
-# does not end up in the distribution.
+# A normal user starts here. We must use mit-threads, bdb and innobase.
+# Otherwise they does not end up in the distribution.
./configure \
--with-unix-socket-path=/var/tmp/mysql.sock \
--with-low-memory \
--with-mit-threads=yes $EXTRA_CONFIG \
--enable-thread-safe-client \
- --without-berkeley-db \
+ --with-berkeley-db \
--with-innobase-db
gmake -j 2