From e3dc55a839a23d6f1b63f05238d0b33454b7a5ab Mon Sep 17 00:00:00 2001
From: unknown <tim@work.mysql.com>
Date: Wed, 7 Mar 2001 22:45:16 +0100
Subject: [PATCH] Do-all-build-steps	We build with BerkeleyDB now, too.

Build-tools/Do-all-build-steps:
  We build with BerkeleyDB now, too.
---
 Build-tools/Do-all-build-steps | 20 ++++++--------------
 1 file 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 ..
+(cd bdb/dist && sh s_all)
+(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
 
-# 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)
-
-# 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