From 745cddfcd791359ff5ae5c2f33db3b196f6df481 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Tue, 4 Oct 2005 23:38:37 +0000 Subject: [PATCH] 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 --- src/ChangeLog | 4 ++++ src/configure.in | 3 --- src/modules/kdb/db2/ChangeLog | 6 ++++++ src/modules/kdb/db2/Makefile.in | 6 +++--- src/modules/kdb/db2/configure.in | 3 +++ .../db2 => modules/kdb/db2/libdb2}/CHANGELOG.db2 | 0 src/{util/db2 => modules/kdb/db2/libdb2}/ChangeLog | 12 ++++++++++++ src/{util/db2 => modules/kdb/db2/libdb2}/Makefile.in | 6 +++--- .../db2 => modules/kdb/db2/libdb2}/Makefile.inc | 0 src/{util/db2 => modules/kdb/db2/libdb2}/README | 0 .../kdb/db2/libdb2}/README.NOT.SLEEPYCAT.DB | 0 src/{util/db2 => modules/kdb/db2/libdb2}/README.db2 | 0 .../db2 => modules/kdb/db2/libdb2}/btree/Makefile.in | 4 ++-- .../kdb/db2/libdb2}/btree/Makefile.inc | 0 .../db2 => modules/kdb/db2/libdb2}/btree/bt_close.c | 0 .../db2 => modules/kdb/db2/libdb2}/btree/bt_conv.c | 0 .../db2 => modules/kdb/db2/libdb2}/btree/bt_debug.c | 0 .../db2 => modules/kdb/db2/libdb2}/btree/bt_delete.c | 0 .../db2 => modules/kdb/db2/libdb2}/btree/bt_get.c | 0 .../db2 => modules/kdb/db2/libdb2}/btree/bt_open.c | 0 .../kdb/db2/libdb2}/btree/bt_overflow.c | 0 .../db2 => modules/kdb/db2/libdb2}/btree/bt_page.c | 0 .../db2 => modules/kdb/db2/libdb2}/btree/bt_put.c | 0 .../db2 => modules/kdb/db2/libdb2}/btree/bt_search.c | 0 .../db2 => modules/kdb/db2/libdb2}/btree/bt_seq.c | 0 .../db2 => modules/kdb/db2/libdb2}/btree/bt_split.c | 0 .../db2 => modules/kdb/db2/libdb2}/btree/bt_utils.c | 0 .../db2 => modules/kdb/db2/libdb2}/btree/btree.h | 0 .../db2 => modules/kdb/db2/libdb2}/btree/extern.h | 0 .../db2 => modules/kdb/db2/libdb2}/clib/Makefile.in | 4 ++-- .../db2 => modules/kdb/db2/libdb2}/clib/memmove.c | 0 .../db2 => modules/kdb/db2/libdb2}/clib/mkstemp.c | 0 .../db2 => modules/kdb/db2/libdb2}/clib/strerror.c | 0 .../db2 => modules/kdb/db2/libdb2}/configure.in | 0 .../db2 => modules/kdb/db2/libdb2}/db/Makefile.in | 4 ++-- .../db2 => modules/kdb/db2/libdb2}/db/Makefile.inc | 0 src/{util/db2 => modules/kdb/db2/libdb2}/db/db.c | 0 .../db2 => modules/kdb/db2/libdb2}/docs/btree.3.ps | 0 .../db2 => modules/kdb/db2/libdb2}/docs/dbopen.3.ps | 0 .../db2 => modules/kdb/db2/libdb2}/docs/hash.3.ps | 0 .../kdb/db2/libdb2}/docs/hash.usenix.ps | 0 .../kdb/db2/libdb2}/docs/libtp.usenix.ps | 0 .../db2 => modules/kdb/db2/libdb2}/docs/mpool.3.ps | 0 .../db2 => modules/kdb/db2/libdb2}/docs/recno.3.ps | 0 .../db2 => modules/kdb/db2/libdb2}/hash/Makefile.in | 4 ++-- .../db2 => modules/kdb/db2/libdb2}/hash/Makefile.inc | 0 src/{util/db2 => modules/kdb/db2/libdb2}/hash/dbm.c | 0 .../db2 => modules/kdb/db2/libdb2}/hash/extern.h | 0 src/{util/db2 => modules/kdb/db2/libdb2}/hash/hash.c | 0 .../db2 => modules/kdb/db2/libdb2}/hash/hash.c.patch | 0 src/{util/db2 => modules/kdb/db2/libdb2}/hash/hash.h | 0 .../kdb/db2/libdb2}/hash/hash_bigkey.c | 0 .../db2 => modules/kdb/db2/libdb2}/hash/hash_debug.c | 0 .../db2 => modules/kdb/db2/libdb2}/hash/hash_func.c | 0 .../db2 => modules/kdb/db2/libdb2}/hash/hash_log2.c | 0 .../db2 => modules/kdb/db2/libdb2}/hash/hash_page.c | 0 .../db2 => modules/kdb/db2/libdb2}/hash/hsearch.c | 0 src/{util/db2 => modules/kdb/db2/libdb2}/hash/page.h | 0 .../db2 => modules/kdb/db2/libdb2}/hash/page.h.patch | 0 .../db2 => modules/kdb/db2/libdb2}/hash/search.h | 0 .../db2 => modules/kdb/db2/libdb2}/include/ChangeLog | 0 .../kdb/db2/libdb2}/include/db-config.h.in | 0 .../db2 => modules/kdb/db2/libdb2}/include/db-dbm.h | 0 .../db2 => modules/kdb/db2/libdb2}/include/db-int.h | 0 .../db2 => modules/kdb/db2/libdb2}/include/db-ndbm.h | 0 .../kdb/db2/libdb2}/include/db-queue.h | 0 .../db2 => modules/kdb/db2/libdb2}/include/db.h | 0 .../db2 => modules/kdb/db2/libdb2}/libdb.exports | 0 .../db2 => modules/kdb/db2/libdb2}/man/Makefile.inc | 0 .../db2 => modules/kdb/db2/libdb2}/man/db.man.ps | 0 .../db2 => modules/kdb/db2/libdb2}/man/db_btree.3 | 0 .../db2 => modules/kdb/db2/libdb2}/man/db_hash.3 | 0 .../db2 => modules/kdb/db2/libdb2}/man/db_lock.3 | 0 .../db2 => modules/kdb/db2/libdb2}/man/db_log.3 | 0 .../db2 => modules/kdb/db2/libdb2}/man/db_mpool.3 | 0 .../db2 => modules/kdb/db2/libdb2}/man/db_open.3 | 0 .../db2 => modules/kdb/db2/libdb2}/man/db_recno.3 | 0 .../db2 => modules/kdb/db2/libdb2}/man/db_txn.3 | 0 .../db2 => modules/kdb/db2/libdb2}/man/spell.ok | 0 .../db2 => modules/kdb/db2/libdb2}/mpool/Makefile.in | 4 ++-- .../kdb/db2/libdb2}/mpool/Makefile.inc | 0 .../db2 => modules/kdb/db2/libdb2}/mpool/README | 0 .../db2 => modules/kdb/db2/libdb2}/mpool/mpool.c | 0 .../db2 => modules/kdb/db2/libdb2}/mpool/mpool.h | 0 .../db2 => modules/kdb/db2/libdb2}/recno/Makefile.in | 4 ++-- .../kdb/db2/libdb2}/recno/Makefile.inc | 0 .../db2 => modules/kdb/db2/libdb2}/recno/extern.h | 0 .../db2 => modules/kdb/db2/libdb2}/recno/rec_close.c | 0 .../kdb/db2/libdb2}/recno/rec_delete.c | 0 .../db2 => modules/kdb/db2/libdb2}/recno/rec_get.c | 0 .../db2 => modules/kdb/db2/libdb2}/recno/rec_open.c | 0 .../db2 => modules/kdb/db2/libdb2}/recno/rec_put.c | 0 .../kdb/db2/libdb2}/recno/rec_search.c | 0 .../db2 => modules/kdb/db2/libdb2}/recno/rec_seq.c | 0 .../db2 => modules/kdb/db2/libdb2}/recno/rec_utils.c | 0 .../db2 => modules/kdb/db2/libdb2}/recno/recno.h | 0 .../db2 => modules/kdb/db2/libdb2}/test/ChangeLog | 4 ++++ .../db2 => modules/kdb/db2/libdb2}/test/Makefile.in | 4 ++-- src/{util/db2 => modules/kdb/db2/libdb2}/test/README | 0 .../kdb/db2/libdb2}/test/SEQ_TEST/data | 0 .../kdb/db2/libdb2}/test/SEQ_TEST/mbox | 0 .../db2 => modules/kdb/db2/libdb2}/test/SEQ_TEST/t.c | 0 .../kdb/db2/libdb2}/test/btree.tests/ChangeLog | 0 .../kdb/db2/libdb2}/test/btree.tests/main.c | 0 .../db2 => modules/kdb/db2/libdb2}/test/dbtest.c | 0 .../db2 => modules/kdb/db2/libdb2}/test/dictionary | 0 .../kdb/db2/libdb2}/test/hash1.tests/Makefile | 0 .../kdb/db2/libdb2}/test/hash1.tests/driver2.c | 0 .../kdb/db2/libdb2}/test/hash1.tests/makedb.sh | 0 .../kdb/db2/libdb2}/test/hash1.tests/tcreat3.c | 0 .../kdb/db2/libdb2}/test/hash1.tests/tdel.c | 0 .../kdb/db2/libdb2}/test/hash1.tests/testit | 0 .../kdb/db2/libdb2}/test/hash1.tests/thash4.c | 0 .../kdb/db2/libdb2}/test/hash1.tests/tread2.c | 0 .../kdb/db2/libdb2}/test/hash1.tests/tseq.c | 0 .../kdb/db2/libdb2}/test/hash1.tests/tverify.c | 0 .../kdb/db2/libdb2}/test/hash2.tests/README | 0 .../kdb/db2/libdb2}/test/hash2.tests/bigtest.c | 0 .../kdb/db2/libdb2}/test/hash2.tests/passtest.c | 0 .../db2/libdb2}/test/hash2.tests/passwd/genpass.c | 0 .../db2 => modules/kdb/db2/libdb2}/test/run.test | 0 src/util/ChangeLog | 6 ++++++ src/util/Makefile.in | 4 +--- 123 files changed, 56 insertions(+), 26 deletions(-) rename src/{util/db2 => modules/kdb/db2/libdb2}/CHANGELOG.db2 (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/ChangeLog (96%) rename src/{util/db2 => modules/kdb/db2/libdb2}/Makefile.in (92%) rename src/{util/db2 => modules/kdb/db2/libdb2}/Makefile.inc (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/README (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/README.NOT.SLEEPYCAT.DB (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/README.db2 (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/Makefile.in (81%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/Makefile.inc (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/bt_close.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/bt_conv.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/bt_debug.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/bt_delete.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/bt_get.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/bt_open.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/bt_overflow.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/bt_page.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/bt_put.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/bt_search.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/bt_seq.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/bt_split.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/bt_utils.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/btree.h (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/btree/extern.h (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/clib/Makefile.in (68%) rename src/{util/db2 => modules/kdb/db2/libdb2}/clib/memmove.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/clib/mkstemp.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/clib/strerror.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/configure.in (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/db/Makefile.in (70%) rename src/{util/db2 => modules/kdb/db2/libdb2}/db/Makefile.inc (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/db/db.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/docs/btree.3.ps (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/docs/dbopen.3.ps (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/docs/hash.3.ps (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/docs/hash.usenix.ps (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/docs/libtp.usenix.ps (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/docs/mpool.3.ps (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/docs/recno.3.ps (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/Makefile.in (78%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/Makefile.inc (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/dbm.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/extern.h (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/hash.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/hash.c.patch (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/hash.h (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/hash_bigkey.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/hash_debug.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/hash_func.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/hash_log2.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/hash_page.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/hsearch.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/page.h (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/page.h.patch (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/hash/search.h (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/include/ChangeLog (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/include/db-config.h.in (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/include/db-dbm.h (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/include/db-int.h (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/include/db-ndbm.h (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/include/db-queue.h (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/include/db.h (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/libdb.exports (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/man/Makefile.inc (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/man/db.man.ps (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/man/db_btree.3 (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/man/db_hash.3 (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/man/db_lock.3 (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/man/db_log.3 (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/man/db_mpool.3 (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/man/db_open.3 (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/man/db_recno.3 (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/man/db_txn.3 (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/man/spell.ok (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/mpool/Makefile.in (70%) rename src/{util/db2 => modules/kdb/db2/libdb2}/mpool/Makefile.inc (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/mpool/README (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/mpool/mpool.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/mpool/mpool.h (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/recno/Makefile.in (78%) rename src/{util/db2 => modules/kdb/db2/libdb2}/recno/Makefile.inc (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/recno/extern.h (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/recno/rec_close.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/recno/rec_delete.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/recno/rec_get.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/recno/rec_open.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/recno/rec_put.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/recno/rec_search.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/recno/rec_seq.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/recno/rec_utils.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/recno/recno.h (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/ChangeLog (95%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/Makefile.in (89%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/README (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/SEQ_TEST/data (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/SEQ_TEST/mbox (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/SEQ_TEST/t.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/btree.tests/ChangeLog (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/btree.tests/main.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/dbtest.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/dictionary (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/hash1.tests/Makefile (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/hash1.tests/driver2.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/hash1.tests/makedb.sh (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/hash1.tests/tcreat3.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/hash1.tests/tdel.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/hash1.tests/testit (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/hash1.tests/thash4.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/hash1.tests/tread2.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/hash1.tests/tseq.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/hash1.tests/tverify.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/hash2.tests/README (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/hash2.tests/bigtest.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/hash2.tests/passtest.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/hash2.tests/passwd/genpass.c (100%) rename src/{util/db2 => modules/kdb/db2/libdb2}/test/run.test (100%) 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 + + * configure.in: Don't configure util/db2. + 2005-09-26 Ken Raeburn * 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 + * 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 similarity index 100% rename from src/util/db2/CHANGELOG.db2 rename to src/modules/kdb/db2/libdb2/CHANGELOG.db2 diff --git a/src/util/db2/ChangeLog b/src/modules/kdb/db2/libdb2/ChangeLog similarity index 96% rename from src/util/db2/ChangeLog rename to 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 + + * 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 * 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 similarity index 92% rename from src/util/db2/Makefile.in rename to 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 similarity index 100% rename from src/util/db2/Makefile.inc rename to src/modules/kdb/db2/libdb2/Makefile.inc diff --git a/src/util/db2/README b/src/modules/kdb/db2/libdb2/README similarity index 100% rename from src/util/db2/README rename to 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 similarity index 100% rename from src/util/db2/README.NOT.SLEEPYCAT.DB rename to 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 similarity index 100% rename from src/util/db2/README.db2 rename to 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 similarity index 81% rename from src/util/db2/btree/Makefile.in rename to 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 similarity index 100% rename from src/util/db2/btree/Makefile.inc rename to 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 similarity index 100% rename from src/util/db2/btree/bt_close.c rename to 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 similarity index 100% rename from src/util/db2/btree/bt_conv.c rename to 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 similarity index 100% rename from src/util/db2/btree/bt_debug.c rename to 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 similarity index 100% rename from src/util/db2/btree/bt_delete.c rename to 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 similarity index 100% rename from src/util/db2/btree/bt_get.c rename to 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 similarity index 100% rename from src/util/db2/btree/bt_open.c rename to 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 similarity index 100% rename from src/util/db2/btree/bt_overflow.c rename to 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 similarity index 100% rename from src/util/db2/btree/bt_page.c rename to 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 similarity index 100% rename from src/util/db2/btree/bt_put.c rename to 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 similarity index 100% rename from src/util/db2/btree/bt_search.c rename to 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 similarity index 100% rename from src/util/db2/btree/bt_seq.c rename to 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 similarity index 100% rename from src/util/db2/btree/bt_split.c rename to 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 similarity index 100% rename from src/util/db2/btree/bt_utils.c rename to 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 similarity index 100% rename from src/util/db2/btree/btree.h rename to 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 similarity index 100% rename from src/util/db2/btree/extern.h rename to 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 similarity index 68% rename from src/util/db2/clib/Makefile.in rename to 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 similarity index 100% rename from src/util/db2/clib/memmove.c rename to 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 similarity index 100% rename from src/util/db2/clib/mkstemp.c rename to 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 similarity index 100% rename from src/util/db2/clib/strerror.c rename to src/modules/kdb/db2/libdb2/clib/strerror.c diff --git a/src/util/db2/configure.in b/src/modules/kdb/db2/libdb2/configure.in similarity index 100% rename from src/util/db2/configure.in rename to 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 similarity index 70% rename from src/util/db2/db/Makefile.in rename to 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 similarity index 100% rename from src/util/db2/db/Makefile.inc rename to 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 similarity index 100% rename from src/util/db2/db/db.c rename to 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 similarity index 100% rename from src/util/db2/docs/btree.3.ps rename to 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 similarity index 100% rename from src/util/db2/docs/dbopen.3.ps rename to 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 similarity index 100% rename from src/util/db2/docs/hash.3.ps rename to 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 similarity index 100% rename from src/util/db2/docs/hash.usenix.ps rename to 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 similarity index 100% rename from src/util/db2/docs/libtp.usenix.ps rename to 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 similarity index 100% rename from src/util/db2/docs/mpool.3.ps rename to 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 similarity index 100% rename from src/util/db2/docs/recno.3.ps rename to 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 similarity index 78% rename from src/util/db2/hash/Makefile.in rename to 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 similarity index 100% rename from src/util/db2/hash/Makefile.inc rename to 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 similarity index 100% rename from src/util/db2/hash/dbm.c rename to 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 similarity index 100% rename from src/util/db2/hash/extern.h rename to 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 similarity index 100% rename from src/util/db2/hash/hash.c rename to 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 similarity index 100% rename from src/util/db2/hash/hash.c.patch rename to 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 similarity index 100% rename from src/util/db2/hash/hash.h rename to 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 similarity index 100% rename from src/util/db2/hash/hash_bigkey.c rename to 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 similarity index 100% rename from src/util/db2/hash/hash_debug.c rename to 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 similarity index 100% rename from src/util/db2/hash/hash_func.c rename to 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 similarity index 100% rename from src/util/db2/hash/hash_log2.c rename to 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 similarity index 100% rename from src/util/db2/hash/hash_page.c rename to 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 similarity index 100% rename from src/util/db2/hash/hsearch.c rename to 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 similarity index 100% rename from src/util/db2/hash/page.h rename to 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 similarity index 100% rename from src/util/db2/hash/page.h.patch rename to 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 similarity index 100% rename from src/util/db2/hash/search.h rename to src/modules/kdb/db2/libdb2/hash/search.h diff --git a/src/util/db2/include/ChangeLog b/src/modules/kdb/db2/libdb2/include/ChangeLog similarity index 100% rename from src/util/db2/include/ChangeLog rename to 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 similarity index 100% rename from src/util/db2/include/db-config.h.in rename to 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 similarity index 100% rename from src/util/db2/include/db-dbm.h rename to 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 similarity index 100% rename from src/util/db2/include/db-int.h rename to 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 similarity index 100% rename from src/util/db2/include/db-ndbm.h rename to 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 similarity index 100% rename from src/util/db2/include/db-queue.h rename to 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 similarity index 100% rename from src/util/db2/include/db.h rename to src/modules/kdb/db2/libdb2/include/db.h diff --git a/src/util/db2/libdb.exports b/src/modules/kdb/db2/libdb2/libdb.exports similarity index 100% rename from src/util/db2/libdb.exports rename to 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 similarity index 100% rename from src/util/db2/man/Makefile.inc rename to 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 similarity index 100% rename from src/util/db2/man/db.man.ps rename to 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 similarity index 100% rename from src/util/db2/man/db_btree.3 rename to 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 similarity index 100% rename from src/util/db2/man/db_hash.3 rename to 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 similarity index 100% rename from src/util/db2/man/db_lock.3 rename to 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 similarity index 100% rename from src/util/db2/man/db_log.3 rename to 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 similarity index 100% rename from src/util/db2/man/db_mpool.3 rename to 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 similarity index 100% rename from src/util/db2/man/db_open.3 rename to 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 similarity index 100% rename from src/util/db2/man/db_recno.3 rename to 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 similarity index 100% rename from src/util/db2/man/db_txn.3 rename to 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 similarity index 100% rename from src/util/db2/man/spell.ok rename to 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 similarity index 70% rename from src/util/db2/mpool/Makefile.in rename to 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 similarity index 100% rename from src/util/db2/mpool/Makefile.inc rename to src/modules/kdb/db2/libdb2/mpool/Makefile.inc diff --git a/src/util/db2/mpool/README b/src/modules/kdb/db2/libdb2/mpool/README similarity index 100% rename from src/util/db2/mpool/README rename to 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 similarity index 100% rename from src/util/db2/mpool/mpool.c rename to 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 similarity index 100% rename from src/util/db2/mpool/mpool.h rename to 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 similarity index 78% rename from src/util/db2/recno/Makefile.in rename to 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 similarity index 100% rename from src/util/db2/recno/Makefile.inc rename to 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 similarity index 100% rename from src/util/db2/recno/extern.h rename to 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 similarity index 100% rename from src/util/db2/recno/rec_close.c rename to 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 similarity index 100% rename from src/util/db2/recno/rec_delete.c rename to 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 similarity index 100% rename from src/util/db2/recno/rec_get.c rename to 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 similarity index 100% rename from src/util/db2/recno/rec_open.c rename to 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 similarity index 100% rename from src/util/db2/recno/rec_put.c rename to 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 similarity index 100% rename from src/util/db2/recno/rec_search.c rename to 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 similarity index 100% rename from src/util/db2/recno/rec_seq.c rename to 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 similarity index 100% rename from src/util/db2/recno/rec_utils.c rename to 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 similarity index 100% rename from src/util/db2/recno/recno.h rename to src/modules/kdb/db2/libdb2/recno/recno.h diff --git a/src/util/db2/test/ChangeLog b/src/modules/kdb/db2/libdb2/test/ChangeLog similarity index 95% rename from src/util/db2/test/ChangeLog rename to 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 + + * Makefile.in (BUILDTOP, myfulldir): Updated for directory move. + 2004-08-27 Ken Raeburn * 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 similarity index 89% rename from src/util/db2/test/Makefile.in rename to 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 similarity index 100% rename from src/util/db2/test/README rename to 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 similarity index 100% rename from src/util/db2/test/SEQ_TEST/data rename to 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 similarity index 100% rename from src/util/db2/test/SEQ_TEST/mbox rename to 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 similarity index 100% rename from src/util/db2/test/SEQ_TEST/t.c rename to 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 similarity index 100% rename from src/util/db2/test/btree.tests/ChangeLog rename to 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 similarity index 100% rename from src/util/db2/test/btree.tests/main.c rename to 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 similarity index 100% rename from src/util/db2/test/dbtest.c rename to src/modules/kdb/db2/libdb2/test/dbtest.c diff --git a/src/util/db2/test/dictionary b/src/modules/kdb/db2/libdb2/test/dictionary similarity index 100% rename from src/util/db2/test/dictionary rename to 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 similarity index 100% rename from src/util/db2/test/hash1.tests/Makefile rename to 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 similarity index 100% rename from src/util/db2/test/hash1.tests/driver2.c rename to 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 similarity index 100% rename from src/util/db2/test/hash1.tests/makedb.sh rename to 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 similarity index 100% rename from src/util/db2/test/hash1.tests/tcreat3.c rename to 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 similarity index 100% rename from src/util/db2/test/hash1.tests/tdel.c rename to 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 similarity index 100% rename from src/util/db2/test/hash1.tests/testit rename to 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 similarity index 100% rename from src/util/db2/test/hash1.tests/thash4.c rename to 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 similarity index 100% rename from src/util/db2/test/hash1.tests/tread2.c rename to 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 similarity index 100% rename from src/util/db2/test/hash1.tests/tseq.c rename to 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 similarity index 100% rename from src/util/db2/test/hash1.tests/tverify.c rename to 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 similarity index 100% rename from src/util/db2/test/hash2.tests/README rename to 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 similarity index 100% rename from src/util/db2/test/hash2.tests/bigtest.c rename to 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 similarity index 100% rename from src/util/db2/test/hash2.tests/passtest.c rename to 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 similarity index 100% rename from src/util/db2/test/hash2.tests/passwd/genpass.c rename to 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 similarity index 100% rename from src/util/db2/test/run.test rename to 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 + + * 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 * 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@ -- 2.26.2