Move the db2 library to the site of its one use, the kdb-db2 module.

Update configuration scripts, pathname make variables, etc., accordingly.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17407 dc483132-0cff-0310-8789-dd5450dbe970

123 files changed, 56 insertions, 26 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b8c19b067..15ed1e29b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-04  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Don't configure util/db2.
+
 2005-09-26  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (fake-install): Do install in modules/kdb/db2.
diff --git a/src/configure.in b/src/configure.in
index 5b78d37ca..68ec28ce1 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -536,9 +536,6 @@ if test "$SS_VERSION" = k5 ; then
   AC_CONFIG_SUBDIRS(util/ss)
 fi
 AC_CONFIG_SUBDIRS(util/profile util/pty)
-if test "$DB_VERSION" = k5 ; then
-  AC_CONFIG_SUBDIRS(util/db2)
-fi
 AC_CONFIG_SUBDIRS(lib/crypto lib/krb5 lib/des425 lib/apputils)
 if test -n "$KRB4_LIB"; then
   AC_CONFIG_SUBDIRS(lib/krb4)
diff --git a/src/modules/kdb/db2/ChangeLog b/src/modules/kdb/db2/ChangeLog
index ec784f996..23c4afcd7 100644
--- a/src/modules/kdb/db2/ChangeLog
+++ b/src/modules/kdb/db2/ChangeLog
@@ -1,5 +1,11 @@
 2005-10-04  Ken Raeburn  <raeburn@mit.edu>
 
+	* libdb2: Directory moved from util/db2.
+	* configure.in: Configure it, unless a system version is to be
+	used.
+	* Makefile.in (DBDIR): Updated.
+	($(DB_DEPS)): Depend on all-recurse.
+
 	* Makefile.in (SHLIB_EXPLIBS): Only use gssrpc.
 	* configure.in: Set enable_shared=yes.
 
diff --git a/src/modules/kdb/db2/Makefile.in b/src/modules/kdb/db2/Makefile.in
index 5b8cf6baf..cf1763e24 100644
--- a/src/modules/kdb/db2/Makefile.in
+++ b/src/modules/kdb/db2/Makefile.in
@@ -25,7 +25,7 @@ SHLIB_EXPLIBS= -lgssrpc # $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_L
 SHLIB_DIRS=-L$(TOPLIBD)
 SHLIB_RDIRS=$(KRB5_LIBDIR)
 
-DBDIR = $(BUILDTOP)/util/db2
+DBDIR = libdb2
 DBOBJLISTS = $(DBOBJLISTS-@DB_VERSION@)
 DBOBJLISTS-sys =
 DBOBJLISTS-k5 = $(DBDIR)/hash/OBJS.ST $(DBDIR)/btree/OBJS.ST \
@@ -53,14 +53,14 @@ all-unix:: $(LIBBASE)$(SO_EXT)
 install-unix:: install-libs
 clean-unix:: clean-libs clean-libobjs
 
+$(DB_DEPS): all-recurse
+
 #lib$(LIBBASE)$(SO_EXT): db2_exp.o
 #	$(CC) -shared -o $@ -L$(TOPLIBD) $^ -ldb $(SHLIB_EXPLIBS)
 
 clean::
 	$(RM) lib$(LIBBASE)$(SO_EXT) db2_exp.o
 
-#adb_openclose.c adb_policy.c : ../adb_err.h
-
 # @libnover_frag@
 # @libobj_frag@
 
diff --git a/src/modules/kdb/db2/configure.in b/src/modules/kdb/db2/configure.in
index 44c6540c2..234c1cc0a 100644
--- a/src/modules/kdb/db2/configure.in
+++ b/src/modules/kdb/db2/configure.in
@@ -20,4 +20,7 @@ dnl The following is for check...
 KRB5_BUILD_PROGRAM
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_LIBRARY_WITH_DEPS
+if test "$DB_VERSION" = k5 ; then
+  AC_CONFIG_SUBDIRS(libdb2)
+fi
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/util/db2/CHANGELOG.db2 b/src/modules/kdb/db2/libdb2/CHANGELOG.db2
index abd05f95d..abd05f95d 100644
--- a/src/util/db2/CHANGELOG.db2
+++ b/src/modules/kdb/db2/libdb2/CHANGELOG.db2
diff --git a/src/util/db2/ChangeLog b/src/modules/kdb/db2/libdb2/ChangeLog
index 83fe66af4..617a075eb 100644
--- a/src/util/db2/ChangeLog
+++ b/src/modules/kdb/db2/libdb2/ChangeLog
@@ -1,3 +1,15 @@
+2005-10-04  Ken Raeburn  <raeburn@mit.edu>
+
+	* Directory moved from util/db2 to modules/kdb/db2/libdb2.
+	* Makefile.in (myfulldir, RELTOP, BUILDTOP): Updated for directory
+	move.
+	* btree/Makefile.in (myfulldir, BUILDTOP): Likewise.
+	* hash/Makefile.in (myfulldir, BUILDTOP): Likewise.
+	* db/Makefile.in (myfulldir, BUILDTOP): Likewise.
+	* mpool/Makefile.in (myfulldir, BUILDTOP): Likewise.
+	* recno/Makefile.in (myfulldir, BUILDTOP): Likewise.
+	* clib/Makefile.in (myfulldir, BUILDTOP): Likewise.
+
 2005-08-20  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Use K5_AC_INIT instead of AC_INIT.
diff --git a/src/util/db2/Makefile.in b/src/modules/kdb/db2/libdb2/Makefile.in
index 37542aee4..75553edf3 100644
--- a/src/util/db2/Makefile.in
+++ b/src/modules/kdb/db2/libdb2/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=.
-myfulldir=util/db2
+myfulldir=modules/kdb/db2/libdb2
 mydir=.
-BUILDTOP=$(REL)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCAL_SUBDIRS=hash btree db mpool recno clib test
 
 LIBBASE=db
@@ -10,7 +10,7 @@ LIBMINOR=1
 STOBJLISTS=hash/OBJS.ST btree/OBJS.ST db/OBJS.ST mpool/OBJS.ST \
 	recno/OBJS.ST clib/OBJS.ST
 SUBDIROBJLISTS=$(STOBJLISTS)
-RELDIR=../util/db2
+RELDIR=../modules/kdb/db2/libdb2
 
 HDRDIR=$(BUILDTOP)/include
 HDRS =	$(HDRDIR)/db.h $(HDRDIR)/db-config.h $(HDRDIR)/db-ndbm.h
diff --git a/src/util/db2/Makefile.inc b/src/modules/kdb/db2/libdb2/Makefile.inc
index 77af9c512..77af9c512 100644
--- a/src/util/db2/Makefile.inc
+++ b/src/modules/kdb/db2/libdb2/Makefile.inc
diff --git a/src/util/db2/README b/src/modules/kdb/db2/libdb2/README
index 70118bef5..70118bef5 100644
--- a/src/util/db2/README
+++ b/src/modules/kdb/db2/libdb2/README
diff --git a/src/util/db2/README.NOT.SLEEPYCAT.DB b/src/modules/kdb/db2/libdb2/README.NOT.SLEEPYCAT.DB
index 112454e94..112454e94 100644
--- a/src/util/db2/README.NOT.SLEEPYCAT.DB
+++ b/src/modules/kdb/db2/libdb2/README.NOT.SLEEPYCAT.DB
diff --git a/src/util/db2/README.db2 b/src/modules/kdb/db2/libdb2/README.db2
index 5700b7393..5700b7393 100644
--- a/src/util/db2/README.db2
+++ b/src/modules/kdb/db2/libdb2/README.db2
diff --git a/src/util/db2/btree/Makefile.in b/src/modules/kdb/db2/libdb2/btree/Makefile.in
index d3b02652a..11f4c8434 100644
--- a/src/util/db2/btree/Makefile.in
+++ b/src/modules/kdb/db2/libdb2/btree/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=./..
-myfulldir=util/db2/btree
+myfulldir=modules/kdb/db2/libdb2/btree
 mydir=btree
-BUILDTOP=$(REL)..$(S)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=	bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o \
 		bt_open.o bt_overflow.o bt_page.o bt_put.o bt_search.o \
 		bt_seq.o bt_split.o bt_utils.o
diff --git a/src/util/db2/btree/Makefile.inc b/src/modules/kdb/db2/libdb2/btree/Makefile.inc
index 8ed76494a..8ed76494a 100644
--- a/src/util/db2/btree/Makefile.inc
+++ b/src/modules/kdb/db2/libdb2/btree/Makefile.inc
diff --git a/src/util/db2/btree/bt_close.c b/src/modules/kdb/db2/libdb2/btree/bt_close.c
index 11be13411..11be13411 100644
--- a/src/util/db2/btree/bt_close.c
+++ b/src/modules/kdb/db2/libdb2/btree/bt_close.c
diff --git a/src/util/db2/btree/bt_conv.c b/src/modules/kdb/db2/libdb2/btree/bt_conv.c
index 6cfa216ca..6cfa216ca 100644
--- a/src/util/db2/btree/bt_conv.c
+++ b/src/modules/kdb/db2/libdb2/btree/bt_conv.c
diff --git a/src/util/db2/btree/bt_debug.c b/src/modules/kdb/db2/libdb2/btree/bt_debug.c
index d36256b3a..d36256b3a 100644
--- a/src/util/db2/btree/bt_debug.c
+++ b/src/modules/kdb/db2/libdb2/btree/bt_debug.c
diff --git a/src/util/db2/btree/bt_delete.c b/src/modules/kdb/db2/libdb2/btree/bt_delete.c
index d002a66ed..d002a66ed 100644
--- a/src/util/db2/btree/bt_delete.c
+++ b/src/modules/kdb/db2/libdb2/btree/bt_delete.c
diff --git a/src/util/db2/btree/bt_get.c b/src/modules/kdb/db2/libdb2/btree/bt_get.c
index b6318211a..b6318211a 100644
--- a/src/util/db2/btree/bt_get.c
+++ b/src/modules/kdb/db2/libdb2/btree/bt_get.c
diff --git a/src/util/db2/btree/bt_open.c b/src/modules/kdb/db2/libdb2/btree/bt_open.c
index 3e4c67a4b..3e4c67a4b 100644
--- a/src/util/db2/btree/bt_open.c
+++ b/src/modules/kdb/db2/libdb2/btree/bt_open.c
diff --git a/src/util/db2/btree/bt_overflow.c b/src/modules/kdb/db2/libdb2/btree/bt_overflow.c
index 8b1f59791..8b1f59791 100644
--- a/src/util/db2/btree/bt_overflow.c
+++ b/src/modules/kdb/db2/libdb2/btree/bt_overflow.c
diff --git a/src/util/db2/btree/bt_page.c b/src/modules/kdb/db2/libdb2/btree/bt_page.c
index 3663cf7f9..3663cf7f9 100644
--- a/src/util/db2/btree/bt_page.c
+++ b/src/modules/kdb/db2/libdb2/btree/bt_page.c
diff --git a/src/util/db2/btree/bt_put.c b/src/modules/kdb/db2/libdb2/btree/bt_put.c
index f75ca9295..f75ca9295 100644
--- a/src/util/db2/btree/bt_put.c
+++ b/src/modules/kdb/db2/libdb2/btree/bt_put.c
diff --git a/src/util/db2/btree/bt_search.c b/src/modules/kdb/db2/libdb2/btree/bt_search.c
index de7ab126f..de7ab126f 100644
--- a/src/util/db2/btree/bt_search.c
+++ b/src/modules/kdb/db2/libdb2/btree/bt_search.c
diff --git a/src/util/db2/btree/bt_seq.c b/src/modules/kdb/db2/libdb2/btree/bt_seq.c
index bbfb9c6c6..bbfb9c6c6 100644
--- a/src/util/db2/btree/bt_seq.c
+++ b/src/modules/kdb/db2/libdb2/btree/bt_seq.c
diff --git a/src/util/db2/btree/bt_split.c b/src/modules/kdb/db2/libdb2/btree/bt_split.c
index 0cc6cf09b..0cc6cf09b 100644
--- a/src/util/db2/btree/bt_split.c
+++ b/src/modules/kdb/db2/libdb2/btree/bt_split.c
diff --git a/src/util/db2/btree/bt_utils.c b/src/modules/kdb/db2/libdb2/btree/bt_utils.c
index 1a34598ad..1a34598ad 100644
--- a/src/util/db2/btree/bt_utils.c
+++ b/src/modules/kdb/db2/libdb2/btree/bt_utils.c
diff --git a/src/util/db2/btree/btree.h b/src/modules/kdb/db2/libdb2/btree/btree.h
index 171712749..171712749 100644
--- a/src/util/db2/btree/btree.h
+++ b/src/modules/kdb/db2/libdb2/btree/btree.h
diff --git a/src/util/db2/btree/extern.h b/src/modules/kdb/db2/libdb2/btree/extern.h
index 3aa88417e..3aa88417e 100644
--- a/src/util/db2/btree/extern.h
+++ b/src/modules/kdb/db2/libdb2/btree/extern.h
diff --git a/src/util/db2/clib/Makefile.in b/src/modules/kdb/db2/libdb2/clib/Makefile.in
index 3f3d2b8be..c5ab55967 100644
--- a/src/util/db2/clib/Makefile.in
+++ b/src/modules/kdb/db2/libdb2/clib/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=./..
-myfulldir=util/db2/clib
+myfulldir=modules/kdb/db2/libdb2/clib
 mydir=clib
-BUILDTOP=$(REL)..$(S)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=@MEMMOVE_OBJ@ @MKSTEMP_OBJ@ @STRERROR_OBJ@
 
 LOCALINCLUDES=-I../include
diff --git a/src/util/db2/clib/memmove.c b/src/modules/kdb/db2/libdb2/clib/memmove.c
index f9bf650a3..f9bf650a3 100644
--- a/src/util/db2/clib/memmove.c
+++ b/src/modules/kdb/db2/libdb2/clib/memmove.c
diff --git a/src/util/db2/clib/mkstemp.c b/src/modules/kdb/db2/libdb2/clib/mkstemp.c
index 71dc7d17a..71dc7d17a 100644
--- a/src/util/db2/clib/mkstemp.c
+++ b/src/modules/kdb/db2/libdb2/clib/mkstemp.c
diff --git a/src/util/db2/clib/strerror.c b/src/modules/kdb/db2/libdb2/clib/strerror.c
index 0a509f79f..0a509f79f 100644
--- a/src/util/db2/clib/strerror.c
+++ b/src/modules/kdb/db2/libdb2/clib/strerror.c
diff --git a/src/util/db2/configure.in b/src/modules/kdb/db2/libdb2/configure.in
index dadaa48df..dadaa48df 100644
--- a/src/util/db2/configure.in
+++ b/src/modules/kdb/db2/libdb2/configure.in
diff --git a/src/util/db2/db/Makefile.in b/src/modules/kdb/db2/libdb2/db/Makefile.in
index b173b0d79..9c7d7c269 100644
--- a/src/util/db2/db/Makefile.in
+++ b/src/modules/kdb/db2/libdb2/db/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=./..
-myfulldir=util/db2/db
+myfulldir=modules/kdb/db2/libdb2/db
 mydir=db
-BUILDTOP=$(REL)..$(S)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=db.o
 
 LOCALINCLUDES=	-I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool
diff --git a/src/util/db2/db/Makefile.inc b/src/modules/kdb/db2/libdb2/db/Makefile.inc
index 59478ba19..59478ba19 100644
--- a/src/util/db2/db/Makefile.inc
+++ b/src/modules/kdb/db2/libdb2/db/Makefile.inc
diff --git a/src/util/db2/db/db.c b/src/modules/kdb/db2/libdb2/db/db.c
index fba779534..fba779534 100644
--- a/src/util/db2/db/db.c
+++ b/src/modules/kdb/db2/libdb2/db/db.c
diff --git a/src/util/db2/docs/btree.3.ps b/src/modules/kdb/db2/libdb2/docs/btree.3.ps
index c79c97232..c79c97232 100644
--- a/src/util/db2/docs/btree.3.ps
+++ b/src/modules/kdb/db2/libdb2/docs/btree.3.ps
diff --git a/src/util/db2/docs/dbopen.3.ps b/src/modules/kdb/db2/libdb2/docs/dbopen.3.ps
index c621bef97..c621bef97 100644
--- a/src/util/db2/docs/dbopen.3.ps
+++ b/src/modules/kdb/db2/libdb2/docs/dbopen.3.ps
diff --git a/src/util/db2/docs/hash.3.ps b/src/modules/kdb/db2/libdb2/docs/hash.3.ps
index 18303cfb7..18303cfb7 100644
--- a/src/util/db2/docs/hash.3.ps
+++ b/src/modules/kdb/db2/libdb2/docs/hash.3.ps
diff --git a/src/util/db2/docs/hash.usenix.ps b/src/modules/kdb/db2/libdb2/docs/hash.usenix.ps
index acdea0992..acdea0992 100644
--- a/src/util/db2/docs/hash.usenix.ps
+++ b/src/modules/kdb/db2/libdb2/docs/hash.usenix.ps
diff --git a/src/util/db2/docs/libtp.usenix.ps b/src/modules/kdb/db2/libdb2/docs/libtp.usenix.ps
index 5b5ba6e1b..5b5ba6e1b 100644
--- a/src/util/db2/docs/libtp.usenix.ps
+++ b/src/modules/kdb/db2/libdb2/docs/libtp.usenix.ps
diff --git a/src/util/db2/docs/mpool.3.ps b/src/modules/kdb/db2/libdb2/docs/mpool.3.ps
index 816c9243c..816c9243c 100644
--- a/src/util/db2/docs/mpool.3.ps
+++ b/src/modules/kdb/db2/libdb2/docs/mpool.3.ps
diff --git a/src/util/db2/docs/recno.3.ps b/src/modules/kdb/db2/libdb2/docs/recno.3.ps
index 8ffccfca9..8ffccfca9 100644
--- a/src/util/db2/docs/recno.3.ps
+++ b/src/modules/kdb/db2/libdb2/docs/recno.3.ps
diff --git a/src/util/db2/hash/Makefile.in b/src/modules/kdb/db2/libdb2/hash/Makefile.in
index e8cbe63bd..0e3b1adcd 100644
--- a/src/util/db2/hash/Makefile.in
+++ b/src/modules/kdb/db2/libdb2/hash/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=./..
-myfulldir=util/db2/hash
+myfulldir=modules/kdb/db2/libdb2/hash
 mydir=hash
-BUILDTOP=$(REL)..$(S)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=	hash.o hash_bigkey.o hash_debug.o hash_func.o hash_log2.o \
 		hash_page.o hsearch.o dbm.o
 
diff --git a/src/util/db2/hash/Makefile.inc b/src/modules/kdb/db2/libdb2/hash/Makefile.inc
index 87746f721..87746f721 100644
--- a/src/util/db2/hash/Makefile.inc
+++ b/src/modules/kdb/db2/libdb2/hash/Makefile.inc
diff --git a/src/util/db2/hash/dbm.c b/src/modules/kdb/db2/libdb2/hash/dbm.c
index 58c9df738..58c9df738 100644
--- a/src/util/db2/hash/dbm.c
+++ b/src/modules/kdb/db2/libdb2/hash/dbm.c
diff --git a/src/util/db2/hash/extern.h b/src/modules/kdb/db2/libdb2/hash/extern.h
index 872b6b0fe..872b6b0fe 100644
--- a/src/util/db2/hash/extern.h
+++ b/src/modules/kdb/db2/libdb2/hash/extern.h
diff --git a/src/util/db2/hash/hash.c b/src/modules/kdb/db2/libdb2/hash/hash.c
index 0e254938e..0e254938e 100644
--- a/src/util/db2/hash/hash.c
+++ b/src/modules/kdb/db2/libdb2/hash/hash.c
diff --git a/src/util/db2/hash/hash.c.patch b/src/modules/kdb/db2/libdb2/hash/hash.c.patch
index b72cc0d26..b72cc0d26 100644
--- a/src/util/db2/hash/hash.c.patch
+++ b/src/modules/kdb/db2/libdb2/hash/hash.c.patch
diff --git a/src/util/db2/hash/hash.h b/src/modules/kdb/db2/libdb2/hash/hash.h
index b202fc9f2..b202fc9f2 100644
--- a/src/util/db2/hash/hash.h
+++ b/src/modules/kdb/db2/libdb2/hash/hash.h
diff --git a/src/util/db2/hash/hash_bigkey.c b/src/modules/kdb/db2/libdb2/hash/hash_bigkey.c
index 06210a57c..06210a57c 100644
--- a/src/util/db2/hash/hash_bigkey.c
+++ b/src/modules/kdb/db2/libdb2/hash/hash_bigkey.c
diff --git a/src/util/db2/hash/hash_debug.c b/src/modules/kdb/db2/libdb2/hash/hash_debug.c
index 69229fc8d..69229fc8d 100644
--- a/src/util/db2/hash/hash_debug.c
+++ b/src/modules/kdb/db2/libdb2/hash/hash_debug.c
diff --git a/src/util/db2/hash/hash_func.c b/src/modules/kdb/db2/libdb2/hash/hash_func.c
index 1dee69460..1dee69460 100644
--- a/src/util/db2/hash/hash_func.c
+++ b/src/modules/kdb/db2/libdb2/hash/hash_func.c
diff --git a/src/util/db2/hash/hash_log2.c b/src/modules/kdb/db2/libdb2/hash/hash_log2.c
index 8c710e5d2..8c710e5d2 100644
--- a/src/util/db2/hash/hash_log2.c
+++ b/src/modules/kdb/db2/libdb2/hash/hash_log2.c
diff --git a/src/util/db2/hash/hash_page.c b/src/modules/kdb/db2/libdb2/hash/hash_page.c
index e25115d3f..e25115d3f 100644
--- a/src/util/db2/hash/hash_page.c
+++ b/src/modules/kdb/db2/libdb2/hash/hash_page.c
diff --git a/src/util/db2/hash/hsearch.c b/src/modules/kdb/db2/libdb2/hash/hsearch.c
index 02ff7ef84..02ff7ef84 100644
--- a/src/util/db2/hash/hsearch.c
+++ b/src/modules/kdb/db2/libdb2/hash/hsearch.c
diff --git a/src/util/db2/hash/page.h b/src/modules/kdb/db2/libdb2/hash/page.h
index 8ef8a2e29..8ef8a2e29 100644
--- a/src/util/db2/hash/page.h
+++ b/src/modules/kdb/db2/libdb2/hash/page.h
diff --git a/src/util/db2/hash/page.h.patch b/src/modules/kdb/db2/libdb2/hash/page.h.patch
index 4a0311fea..4a0311fea 100644
--- a/src/util/db2/hash/page.h.patch
+++ b/src/modules/kdb/db2/libdb2/hash/page.h.patch
diff --git a/src/util/db2/hash/search.h b/src/modules/kdb/db2/libdb2/hash/search.h
index 6d6a0a82f..6d6a0a82f 100644
--- a/src/util/db2/hash/search.h
+++ b/src/modules/kdb/db2/libdb2/hash/search.h
diff --git a/src/util/db2/include/ChangeLog b/src/modules/kdb/db2/libdb2/include/ChangeLog
index 676bbd44a..676bbd44a 100644
--- a/src/util/db2/include/ChangeLog
+++ b/src/modules/kdb/db2/libdb2/include/ChangeLog
diff --git a/src/util/db2/include/db-config.h.in b/src/modules/kdb/db2/libdb2/include/db-config.h.in
index bcd7991b3..bcd7991b3 100644
--- a/src/util/db2/include/db-config.h.in
+++ b/src/modules/kdb/db2/libdb2/include/db-config.h.in
diff --git a/src/util/db2/include/db-dbm.h b/src/modules/kdb/db2/libdb2/include/db-dbm.h
index 28c93786c..28c93786c 100644
--- a/src/util/db2/include/db-dbm.h
+++ b/src/modules/kdb/db2/libdb2/include/db-dbm.h
diff --git a/src/util/db2/include/db-int.h b/src/modules/kdb/db2/libdb2/include/db-int.h
index bbb22925a..bbb22925a 100644
--- a/src/util/db2/include/db-int.h
+++ b/src/modules/kdb/db2/libdb2/include/db-int.h
diff --git a/src/util/db2/include/db-ndbm.h b/src/modules/kdb/db2/libdb2/include/db-ndbm.h
index e99f46fdc..e99f46fdc 100644
--- a/src/util/db2/include/db-ndbm.h
+++ b/src/modules/kdb/db2/libdb2/include/db-ndbm.h
diff --git a/src/util/db2/include/db-queue.h b/src/modules/kdb/db2/libdb2/include/db-queue.h
index 40d32ccb6..40d32ccb6 100644
--- a/src/util/db2/include/db-queue.h
+++ b/src/modules/kdb/db2/libdb2/include/db-queue.h
diff --git a/src/util/db2/include/db.h b/src/modules/kdb/db2/libdb2/include/db.h
index 980145a3d..980145a3d 100644
--- a/src/util/db2/include/db.h
+++ b/src/modules/kdb/db2/libdb2/include/db.h
diff --git a/src/util/db2/libdb.exports b/src/modules/kdb/db2/libdb2/libdb.exports
index 5dbc2e438..5dbc2e438 100644
--- a/src/util/db2/libdb.exports
+++ b/src/modules/kdb/db2/libdb2/libdb.exports
diff --git a/src/util/db2/man/Makefile.inc b/src/modules/kdb/db2/libdb2/man/Makefile.inc
index f85cba1f8..f85cba1f8 100644
--- a/src/util/db2/man/Makefile.inc
+++ b/src/modules/kdb/db2/libdb2/man/Makefile.inc
diff --git a/src/util/db2/man/db.man.ps b/src/modules/kdb/db2/libdb2/man/db.man.ps
index 23feea6e5..23feea6e5 100644
--- a/src/util/db2/man/db.man.ps
+++ b/src/modules/kdb/db2/libdb2/man/db.man.ps
diff --git a/src/util/db2/man/db_btree.3 b/src/modules/kdb/db2/libdb2/man/db_btree.3
index 25e289f3c..25e289f3c 100644
--- a/src/util/db2/man/db_btree.3
+++ b/src/modules/kdb/db2/libdb2/man/db_btree.3
diff --git a/src/util/db2/man/db_hash.3 b/src/modules/kdb/db2/libdb2/man/db_hash.3
index adb88fca7..adb88fca7 100644
--- a/src/util/db2/man/db_hash.3
+++ b/src/modules/kdb/db2/libdb2/man/db_hash.3
diff --git a/src/util/db2/man/db_lock.3 b/src/modules/kdb/db2/libdb2/man/db_lock.3
index b18a38c60..b18a38c60 100644
--- a/src/util/db2/man/db_lock.3
+++ b/src/modules/kdb/db2/libdb2/man/db_lock.3
diff --git a/src/util/db2/man/db_log.3 b/src/modules/kdb/db2/libdb2/man/db_log.3
index 34c4d1f5d..34c4d1f5d 100644
--- a/src/util/db2/man/db_log.3
+++ b/src/modules/kdb/db2/libdb2/man/db_log.3
diff --git a/src/util/db2/man/db_mpool.3 b/src/modules/kdb/db2/libdb2/man/db_mpool.3
index 4b683b618..4b683b618 100644
--- a/src/util/db2/man/db_mpool.3
+++ b/src/modules/kdb/db2/libdb2/man/db_mpool.3
diff --git a/src/util/db2/man/db_open.3 b/src/modules/kdb/db2/libdb2/man/db_open.3
index f988ef924..f988ef924 100644
--- a/src/util/db2/man/db_open.3
+++ b/src/modules/kdb/db2/libdb2/man/db_open.3
diff --git a/src/util/db2/man/db_recno.3 b/src/modules/kdb/db2/libdb2/man/db_recno.3
index 6b93b3f5a..6b93b3f5a 100644
--- a/src/util/db2/man/db_recno.3
+++ b/src/modules/kdb/db2/libdb2/man/db_recno.3
diff --git a/src/util/db2/man/db_txn.3 b/src/modules/kdb/db2/libdb2/man/db_txn.3
index 18ad64692..18ad64692 100644
--- a/src/util/db2/man/db_txn.3
+++ b/src/modules/kdb/db2/libdb2/man/db_txn.3
diff --git a/src/util/db2/man/spell.ok b/src/modules/kdb/db2/libdb2/man/spell.ok
index 794b00bf8..794b00bf8 100644
--- a/src/util/db2/man/spell.ok
+++ b/src/modules/kdb/db2/libdb2/man/spell.ok
diff --git a/src/util/db2/mpool/Makefile.in b/src/modules/kdb/db2/libdb2/mpool/Makefile.in
index 6f487ee6d..e40c16174 100644
--- a/src/util/db2/mpool/Makefile.in
+++ b/src/modules/kdb/db2/libdb2/mpool/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=./..
-myfulldir=util/db2/mpool
+myfulldir=modules/kdb/db2/libdb2/mpool
 mydir=mpool
-BUILDTOP=$(REL)..$(S)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=mpool.o
 
 LOCALINCLUDES=	-I. -I$(srcdir)/../include -I../include -I$(srcdir)/../db
diff --git a/src/util/db2/mpool/Makefile.inc b/src/modules/kdb/db2/libdb2/mpool/Makefile.inc
index 93210c89e..93210c89e 100644
--- a/src/util/db2/mpool/Makefile.inc
+++ b/src/modules/kdb/db2/libdb2/mpool/Makefile.inc
diff --git a/src/util/db2/mpool/README b/src/modules/kdb/db2/libdb2/mpool/README
index 0f01fbcdb..0f01fbcdb 100644
--- a/src/util/db2/mpool/README
+++ b/src/modules/kdb/db2/libdb2/mpool/README
diff --git a/src/util/db2/mpool/mpool.c b/src/modules/kdb/db2/libdb2/mpool/mpool.c
index d172f71ba..d172f71ba 100644
--- a/src/util/db2/mpool/mpool.c
+++ b/src/modules/kdb/db2/libdb2/mpool/mpool.c
diff --git a/src/util/db2/mpool/mpool.h b/src/modules/kdb/db2/libdb2/mpool/mpool.h
index 627ad5b36..627ad5b36 100644
--- a/src/util/db2/mpool/mpool.h
+++ b/src/modules/kdb/db2/libdb2/mpool/mpool.h
diff --git a/src/util/db2/recno/Makefile.in b/src/modules/kdb/db2/libdb2/recno/Makefile.in
index 6726227c6..e90a7cb3d 100644
--- a/src/util/db2/recno/Makefile.in
+++ b/src/modules/kdb/db2/libdb2/recno/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=./..
-myfulldir=util/db2/recno
+myfulldir=modules/kdb/db2/libdb2/recno
 mydir=recno
-BUILDTOP=$(REL)..$(S)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=	rec_close.o rec_delete.o rec_get.o rec_open.o rec_put.o \
 		rec_search.o rec_seq.o rec_utils.o
 
diff --git a/src/util/db2/recno/Makefile.inc b/src/modules/kdb/db2/libdb2/recno/Makefile.inc
index e49e22552..e49e22552 100644
--- a/src/util/db2/recno/Makefile.inc
+++ b/src/modules/kdb/db2/libdb2/recno/Makefile.inc
diff --git a/src/util/db2/recno/extern.h b/src/modules/kdb/db2/libdb2/recno/extern.h
index 98e382c37..98e382c37 100644
--- a/src/util/db2/recno/extern.h
+++ b/src/modules/kdb/db2/libdb2/recno/extern.h
diff --git a/src/util/db2/recno/rec_close.c b/src/modules/kdb/db2/libdb2/recno/rec_close.c
index ed3da6ea4..ed3da6ea4 100644
--- a/src/util/db2/recno/rec_close.c
+++ b/src/modules/kdb/db2/libdb2/recno/rec_close.c
diff --git a/src/util/db2/recno/rec_delete.c b/src/modules/kdb/db2/libdb2/recno/rec_delete.c
index b69c9ad74..b69c9ad74 100644
--- a/src/util/db2/recno/rec_delete.c
+++ b/src/modules/kdb/db2/libdb2/recno/rec_delete.c
diff --git a/src/util/db2/recno/rec_get.c b/src/modules/kdb/db2/libdb2/recno/rec_get.c
index 230b2d4f5..230b2d4f5 100644
--- a/src/util/db2/recno/rec_get.c
+++ b/src/modules/kdb/db2/libdb2/recno/rec_get.c
diff --git a/src/util/db2/recno/rec_open.c b/src/modules/kdb/db2/libdb2/recno/rec_open.c
index f18a1cb02..f18a1cb02 100644
--- a/src/util/db2/recno/rec_open.c
+++ b/src/modules/kdb/db2/libdb2/recno/rec_open.c
diff --git a/src/util/db2/recno/rec_put.c b/src/modules/kdb/db2/libdb2/recno/rec_put.c
index e7fa75882..e7fa75882 100644
--- a/src/util/db2/recno/rec_put.c
+++ b/src/modules/kdb/db2/libdb2/recno/rec_put.c
diff --git a/src/util/db2/recno/rec_search.c b/src/modules/kdb/db2/libdb2/recno/rec_search.c
index a328f1be0..a328f1be0 100644
--- a/src/util/db2/recno/rec_search.c
+++ b/src/modules/kdb/db2/libdb2/recno/rec_search.c
diff --git a/src/util/db2/recno/rec_seq.c b/src/modules/kdb/db2/libdb2/recno/rec_seq.c
index 1edaa998e..1edaa998e 100644
--- a/src/util/db2/recno/rec_seq.c
+++ b/src/modules/kdb/db2/libdb2/recno/rec_seq.c
diff --git a/src/util/db2/recno/rec_utils.c b/src/modules/kdb/db2/libdb2/recno/rec_utils.c
index f757a724f..f757a724f 100644
--- a/src/util/db2/recno/rec_utils.c
+++ b/src/modules/kdb/db2/libdb2/recno/rec_utils.c
diff --git a/src/util/db2/recno/recno.h b/src/modules/kdb/db2/libdb2/recno/recno.h
index bec772c2f..bec772c2f 100644
--- a/src/util/db2/recno/recno.h
+++ b/src/modules/kdb/db2/libdb2/recno/recno.h
diff --git a/src/util/db2/test/ChangeLog b/src/modules/kdb/db2/libdb2/test/ChangeLog
index cfcce7d7f..aad74b4c7 100644
--- a/src/util/db2/test/ChangeLog
+++ b/src/modules/kdb/db2/libdb2/test/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-04  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (BUILDTOP, myfulldir): Updated for directory move.
+
 2004-08-27  Ken Raeburn  <raeburn@mit.edu>
 
 	* run.test (getnwords): Run data through "cat -v", because at
diff --git a/src/util/db2/test/Makefile.in b/src/modules/kdb/db2/libdb2/test/Makefile.in
index 18d366ca8..5df1d2f60 100644
--- a/src/util/db2/test/Makefile.in
+++ b/src/modules/kdb/db2/libdb2/test/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=./..
-myfulldir=util/db2/test
+myfulldir=modules/kdb/db2/libdb2/test
 mydir=test
-BUILDTOP=$(REL)..$(S)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 
 FCTSH = @FCTSH@
 TMPDIR=.
diff --git a/src/util/db2/test/README b/src/modules/kdb/db2/libdb2/test/README
index 0c0cd13d8..0c0cd13d8 100644
--- a/src/util/db2/test/README
+++ b/src/modules/kdb/db2/libdb2/test/README
diff --git a/src/util/db2/test/SEQ_TEST/data b/src/modules/kdb/db2/libdb2/test/SEQ_TEST/data
index 37a518537..37a518537 100644
--- a/src/util/db2/test/SEQ_TEST/data
+++ b/src/modules/kdb/db2/libdb2/test/SEQ_TEST/data
diff --git a/src/util/db2/test/SEQ_TEST/mbox b/src/modules/kdb/db2/libdb2/test/SEQ_TEST/mbox
index 9d5d49d07..9d5d49d07 100644
--- a/src/util/db2/test/SEQ_TEST/mbox
+++ b/src/modules/kdb/db2/libdb2/test/SEQ_TEST/mbox
diff --git a/src/util/db2/test/SEQ_TEST/t.c b/src/modules/kdb/db2/libdb2/test/SEQ_TEST/t.c
index f77b676f1..f77b676f1 100644
--- a/src/util/db2/test/SEQ_TEST/t.c
+++ b/src/modules/kdb/db2/libdb2/test/SEQ_TEST/t.c
diff --git a/src/util/db2/test/btree.tests/ChangeLog b/src/modules/kdb/db2/libdb2/test/btree.tests/ChangeLog
index 339db618a..339db618a 100644
--- a/src/util/db2/test/btree.tests/ChangeLog
+++ b/src/modules/kdb/db2/libdb2/test/btree.tests/ChangeLog
diff --git a/src/util/db2/test/btree.tests/main.c b/src/modules/kdb/db2/libdb2/test/btree.tests/main.c
index 06f02b3ad..06f02b3ad 100644
--- a/src/util/db2/test/btree.tests/main.c
+++ b/src/modules/kdb/db2/libdb2/test/btree.tests/main.c
diff --git a/src/util/db2/test/dbtest.c b/src/modules/kdb/db2/libdb2/test/dbtest.c
index 10a89a6fa..10a89a6fa 100644
--- a/src/util/db2/test/dbtest.c
+++ b/src/modules/kdb/db2/libdb2/test/dbtest.c
diff --git a/src/util/db2/test/dictionary b/src/modules/kdb/db2/libdb2/test/dictionary
index 53640f016..53640f016 100644
--- a/src/util/db2/test/dictionary
+++ b/src/modules/kdb/db2/libdb2/test/dictionary
diff --git a/src/util/db2/test/hash1.tests/Makefile b/src/modules/kdb/db2/libdb2/test/hash1.tests/Makefile
index 348a8f818..348a8f818 100644
--- a/src/util/db2/test/hash1.tests/Makefile
+++ b/src/modules/kdb/db2/libdb2/test/hash1.tests/Makefile
diff --git a/src/util/db2/test/hash1.tests/driver2.c b/src/modules/kdb/db2/libdb2/test/hash1.tests/driver2.c
index 6a3b432cb..6a3b432cb 100644
--- a/src/util/db2/test/hash1.tests/driver2.c
+++ b/src/modules/kdb/db2/libdb2/test/hash1.tests/driver2.c
diff --git a/src/util/db2/test/hash1.tests/makedb.sh b/src/modules/kdb/db2/libdb2/test/hash1.tests/makedb.sh
index 15901de19..15901de19 100644
--- a/src/util/db2/test/hash1.tests/makedb.sh
+++ b/src/modules/kdb/db2/libdb2/test/hash1.tests/makedb.sh
diff --git a/src/util/db2/test/hash1.tests/tcreat3.c b/src/modules/kdb/db2/libdb2/test/hash1.tests/tcreat3.c
index f11487b32..f11487b32 100644
--- a/src/util/db2/test/hash1.tests/tcreat3.c
+++ b/src/modules/kdb/db2/libdb2/test/hash1.tests/tcreat3.c
diff --git a/src/util/db2/test/hash1.tests/tdel.c b/src/modules/kdb/db2/libdb2/test/hash1.tests/tdel.c
index 826611486..826611486 100644
--- a/src/util/db2/test/hash1.tests/tdel.c
+++ b/src/modules/kdb/db2/libdb2/test/hash1.tests/tdel.c
diff --git a/src/util/db2/test/hash1.tests/testit b/src/modules/kdb/db2/libdb2/test/hash1.tests/testit
index c80dc4e69..c80dc4e69 100644
--- a/src/util/db2/test/hash1.tests/testit
+++ b/src/modules/kdb/db2/libdb2/test/hash1.tests/testit
diff --git a/src/util/db2/test/hash1.tests/thash4.c b/src/modules/kdb/db2/libdb2/test/hash1.tests/thash4.c
index b15b617bc..b15b617bc 100644
--- a/src/util/db2/test/hash1.tests/thash4.c
+++ b/src/modules/kdb/db2/libdb2/test/hash1.tests/thash4.c
diff --git a/src/util/db2/test/hash1.tests/tread2.c b/src/modules/kdb/db2/libdb2/test/hash1.tests/tread2.c
index 1e2cc4c50..1e2cc4c50 100644
--- a/src/util/db2/test/hash1.tests/tread2.c
+++ b/src/modules/kdb/db2/libdb2/test/hash1.tests/tread2.c
diff --git a/src/util/db2/test/hash1.tests/tseq.c b/src/modules/kdb/db2/libdb2/test/hash1.tests/tseq.c
index d2d36862d..d2d36862d 100644
--- a/src/util/db2/test/hash1.tests/tseq.c
+++ b/src/modules/kdb/db2/libdb2/test/hash1.tests/tseq.c
diff --git a/src/util/db2/test/hash1.tests/tverify.c b/src/modules/kdb/db2/libdb2/test/hash1.tests/tverify.c
index 4747804f7..4747804f7 100644
--- a/src/util/db2/test/hash1.tests/tverify.c
+++ b/src/modules/kdb/db2/libdb2/test/hash1.tests/tverify.c
diff --git a/src/util/db2/test/hash2.tests/README b/src/modules/kdb/db2/libdb2/test/hash2.tests/README
index f29ccf7e1..f29ccf7e1 100644
--- a/src/util/db2/test/hash2.tests/README
+++ b/src/modules/kdb/db2/libdb2/test/hash2.tests/README
diff --git a/src/util/db2/test/hash2.tests/bigtest.c b/src/modules/kdb/db2/libdb2/test/hash2.tests/bigtest.c
index 81c559ad2..81c559ad2 100644
--- a/src/util/db2/test/hash2.tests/bigtest.c
+++ b/src/modules/kdb/db2/libdb2/test/hash2.tests/bigtest.c
diff --git a/src/util/db2/test/hash2.tests/passtest.c b/src/modules/kdb/db2/libdb2/test/hash2.tests/passtest.c
index adb72c004..adb72c004 100644
--- a/src/util/db2/test/hash2.tests/passtest.c
+++ b/src/modules/kdb/db2/libdb2/test/hash2.tests/passtest.c
diff --git a/src/util/db2/test/hash2.tests/passwd/genpass.c b/src/modules/kdb/db2/libdb2/test/hash2.tests/passwd/genpass.c
index da3767687..da3767687 100644
--- a/src/util/db2/test/hash2.tests/passwd/genpass.c
+++ b/src/modules/kdb/db2/libdb2/test/hash2.tests/passwd/genpass.c
diff --git a/src/util/db2/test/run.test b/src/modules/kdb/db2/libdb2/test/run.test
index 48c3a63d0..48c3a63d0 100644
--- a/src/util/db2/test/run.test
+++ b/src/modules/kdb/db2/libdb2/test/run.test
diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 47761a109..56872aeac 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-04  Ken Raeburn  <raeburn@mit.edu>
+
+	* db2: Directory moved to modules/kdb/db2/libdb2.
+	* Makefile.in (LOCAL_SUBDIRS): Don't reference it.
+	(MAYBE_DB_k5, MAYBE_DB_sys): Variables deleted.
+
 2005-09-08  Tom Yu  <tlyu@mit.edu>
 
 	* mkrel: Update for svn.
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index ecad6b2b8..c9fd1d8ce 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -7,16 +7,14 @@ mydir=util
 ##WIN32### below in the 'all-windows' target anyways, so just hide this.
 ##WIN32##!if 0
 LOCAL_SUBDIRS=support $(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
-	profile pty $(MAYBE_DB_@DB_VERSION@) send-pr
+	profile pty send-pr
 ##WIN32##!endif
 BUILDTOP=$(REL)..
 
 MAYBE_ET_k5 = et
 MAYBE_SS_k5 = ss
-MAYBE_DB_k5 = db2
 MAYBE_ET_sys =
 MAYBE_SS_sys =
-MAYBE_DB_sys =
 
 editsh = sed -e 's,@''ARADD''@,$(ARADD),g' -e 's,@''ARCHIVE''@,$(ARCHIVE),g'
 HOST_TYPE=@HOST_TYPE@