Merge work.mysql.com:/home/bk/mysql

into threads.polyesthetic.msg:/usr/local/src/my/work


BitKeeper/etc/logging_ok:
  'Auto converge'

BitKeeper/etc/logging_ok

 heikki@donna.mysql.fi
 jcole@tetra.spaceapes.com
+monty@donna.mysql.fi
 mwagner@evoq.mwagner.org
 sasha@mysql.sashanet.com
+sasha@work.mysql.com
 serg@serg.mysql.com
-monty@donna.mysql.fi
 tim@threads.polyesthetic.msg
 tim@work.mysql.com

bdb/Makefile.in

+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+# Adaptor makefile to translate between what automake expects and what
+# BDB provides (or vice versa).
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+
+# distdir and top_distdir are set by the calling Makefile
+
+bdb_build = build_unix
+files = LICENSE Makefile Makefile.in README
+subdirs = btree build_vxworks build_win32 clib common cxx db db185 \
+	db_archive db_checkpoint db_deadlock db_dump db_dump185 db_load \
+	db_printlog db_recover db_stat db_upgrade db_verify dbm dist docs \
+	env examples_c examples_cxx hash hsearch include java libdb_java \
+	lock log mp mutex os os_vxworks os_win32 perl.BerkeleyDB \
+	perl.DB_File qam rpc_client rpc_server tcl test txn xa
+
+@SET_MAKE@
+
+all:
+	cd $(bdb_build) && $(MAKE) all
+
+# May want to fix this, and MYSQL/configure, to install things
+install:
+
+distdir:
+	for s in $(subdirs); do \
+	  cp -pr $(srcdir)/$$s $(distdir)/$$s; \
+	done
+	for f in $(files); do \
+	  test -f $(distdir)/$$f || cp -p $(srcdir)/$$f $(distdir)/$$f; \
+	done
+	mkdir $(distdir)/$(bdb_build)

configure.in

@@ -1869,7 +1869,7 @@ then
   if test X"$have_berkeley_db" != Xno; then
     if test X"$have_berkeley_db" != Xyes; then
       # we must build berkeley db from source
-      sql_server_dirs="$have_berkeley_db/build_unix $sql_server_dirs"
+      sql_server_dirs="$have_berkeley_db $sql_server_dirs"
 
       echo "CONFIGURING FOR BERKELEY DB" 
       bdb_conf_flags=
@@ -1880,19 +1880,6 @@ then
       (cd $bdb && cd build_unix && sh ../dist/configure $bdb_conf_flags) \
       || AC_MSG_ERROR([could not configure Berkeley DB])
 
-      echo "Modifying Berkeley DB install target"
-      sed -e '/^install:/ c\
-install: all		# modified by MySQL configure\
-dnl This is needed because in some versions of BDB the install target
-dnl is continued on a second line.
-mysql-noinstall-hack:' \
-        "$bdb/build_unix/Makefile" > ac_BDB_Makefile
-
-      rm "$bdb/build_unix/Makefile" \
-      && cp ac_BDB_Makefile "$bdb/build_unix/Makefile" \
-      && rm ac_BDB_Makefile \
-      || AC_MSG_ERROR([could not modify Berkeley DB Makefile])
-
       echo "END OF BERKELEY DB CONFIGURATION"
     fi
 
@@ -1944,6 +1931,7 @@ AC_SUBST(GXX)
 # Output results
 AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \
  strings/Makefile regex/Makefile heap/Makefile \
+ bdb/Makefile \
  myisam/Makefile myisammrg/Makefile \
  man/Makefile \
  readline/Makefile libmysql_r/Makefile libmysql/Makefile client/Makefile \