diff options
-rw-r--r-- | src/ChangeLog | 4 | ||||
-rw-r--r-- | src/configure.in | 3 | ||||
-rw-r--r-- | src/modules/kdb/db2/ChangeLog | 6 | ||||
-rw-r--r-- | src/modules/kdb/db2/Makefile.in | 6 | ||||
-rw-r--r-- | src/modules/kdb/db2/configure.in | 3 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/CHANGELOG.db2 (renamed from src/util/db2/CHANGELOG.db2) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/ChangeLog (renamed from src/util/db2/ChangeLog) | 12 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/Makefile.in (renamed from src/util/db2/Makefile.in) | 6 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/Makefile.inc (renamed from src/util/db2/Makefile.inc) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/README (renamed from src/util/db2/README) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/README.NOT.SLEEPYCAT.DB (renamed from src/util/db2/README.NOT.SLEEPYCAT.DB) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/README.db2 (renamed from src/util/db2/README.db2) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/Makefile.in (renamed from src/util/db2/btree/Makefile.in) | 4 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/Makefile.inc (renamed from src/util/db2/btree/Makefile.inc) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/bt_close.c (renamed from src/util/db2/btree/bt_close.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/bt_conv.c (renamed from src/util/db2/btree/bt_conv.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/bt_debug.c (renamed from src/util/db2/btree/bt_debug.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/bt_delete.c (renamed from src/util/db2/btree/bt_delete.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/bt_get.c (renamed from src/util/db2/btree/bt_get.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/bt_open.c (renamed from src/util/db2/btree/bt_open.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/bt_overflow.c (renamed from src/util/db2/btree/bt_overflow.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/bt_page.c (renamed from src/util/db2/btree/bt_page.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/bt_put.c (renamed from src/util/db2/btree/bt_put.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/bt_search.c (renamed from src/util/db2/btree/bt_search.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/bt_seq.c (renamed from src/util/db2/btree/bt_seq.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/bt_split.c (renamed from src/util/db2/btree/bt_split.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/bt_utils.c (renamed from src/util/db2/btree/bt_utils.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/btree.h (renamed from src/util/db2/btree/btree.h) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/btree/extern.h (renamed from src/util/db2/btree/extern.h) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/clib/Makefile.in (renamed from src/util/db2/clib/Makefile.in) | 4 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/clib/memmove.c (renamed from src/util/db2/clib/memmove.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/clib/mkstemp.c (renamed from src/util/db2/clib/mkstemp.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/clib/strerror.c (renamed from src/util/db2/clib/strerror.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/configure.in (renamed from src/util/db2/configure.in) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/db/Makefile.in (renamed from src/util/db2/db/Makefile.in) | 4 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/db/Makefile.inc (renamed from src/util/db2/db/Makefile.inc) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/db/db.c (renamed from src/util/db2/db/db.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/docs/btree.3.ps (renamed from src/util/db2/docs/btree.3.ps) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/docs/dbopen.3.ps (renamed from src/util/db2/docs/dbopen.3.ps) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/docs/hash.3.ps (renamed from src/util/db2/docs/hash.3.ps) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/docs/hash.usenix.ps (renamed from src/util/db2/docs/hash.usenix.ps) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/docs/libtp.usenix.ps (renamed from src/util/db2/docs/libtp.usenix.ps) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/docs/mpool.3.ps (renamed from src/util/db2/docs/mpool.3.ps) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/docs/recno.3.ps (renamed from src/util/db2/docs/recno.3.ps) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/Makefile.in (renamed from src/util/db2/hash/Makefile.in) | 4 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/Makefile.inc (renamed from src/util/db2/hash/Makefile.inc) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/dbm.c (renamed from src/util/db2/hash/dbm.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/extern.h (renamed from src/util/db2/hash/extern.h) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/hash.c (renamed from src/util/db2/hash/hash.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/hash.c.patch (renamed from src/util/db2/hash/hash.c.patch) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/hash.h (renamed from src/util/db2/hash/hash.h) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/hash_bigkey.c (renamed from src/util/db2/hash/hash_bigkey.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/hash_debug.c (renamed from src/util/db2/hash/hash_debug.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/hash_func.c (renamed from src/util/db2/hash/hash_func.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/hash_log2.c (renamed from src/util/db2/hash/hash_log2.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/hash_page.c (renamed from src/util/db2/hash/hash_page.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/hsearch.c (renamed from src/util/db2/hash/hsearch.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/page.h (renamed from src/util/db2/hash/page.h) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/page.h.patch (renamed from src/util/db2/hash/page.h.patch) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/hash/search.h (renamed from src/util/db2/hash/search.h) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/include/ChangeLog (renamed from src/util/db2/include/ChangeLog) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/include/db-config.h.in (renamed from src/util/db2/include/db-config.h.in) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/include/db-dbm.h (renamed from src/util/db2/include/db-dbm.h) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/include/db-int.h (renamed from src/util/db2/include/db-int.h) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/include/db-ndbm.h (renamed from src/util/db2/include/db-ndbm.h) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/include/db-queue.h (renamed from src/util/db2/include/db-queue.h) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/include/db.h (renamed from src/util/db2/include/db.h) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/libdb.exports (renamed from src/util/db2/libdb.exports) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/man/Makefile.inc (renamed from src/util/db2/man/Makefile.inc) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/man/db.man.ps (renamed from src/util/db2/man/db.man.ps) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/man/db_btree.3 (renamed from src/util/db2/man/db_btree.3) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/man/db_hash.3 (renamed from src/util/db2/man/db_hash.3) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/man/db_lock.3 (renamed from src/util/db2/man/db_lock.3) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/man/db_log.3 (renamed from src/util/db2/man/db_log.3) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/man/db_mpool.3 (renamed from src/util/db2/man/db_mpool.3) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/man/db_open.3 (renamed from src/util/db2/man/db_open.3) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/man/db_recno.3 (renamed from src/util/db2/man/db_recno.3) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/man/db_txn.3 (renamed from src/util/db2/man/db_txn.3) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/man/spell.ok (renamed from src/util/db2/man/spell.ok) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/mpool/Makefile.in (renamed from src/util/db2/mpool/Makefile.in) | 4 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/mpool/Makefile.inc (renamed from src/util/db2/mpool/Makefile.inc) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/mpool/README (renamed from src/util/db2/mpool/README) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/mpool/mpool.c (renamed from src/util/db2/mpool/mpool.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/mpool/mpool.h (renamed from src/util/db2/mpool/mpool.h) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/recno/Makefile.in (renamed from src/util/db2/recno/Makefile.in) | 4 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/recno/Makefile.inc (renamed from src/util/db2/recno/Makefile.inc) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/recno/extern.h (renamed from src/util/db2/recno/extern.h) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/recno/rec_close.c (renamed from src/util/db2/recno/rec_close.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/recno/rec_delete.c (renamed from src/util/db2/recno/rec_delete.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/recno/rec_get.c (renamed from src/util/db2/recno/rec_get.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/recno/rec_open.c (renamed from src/util/db2/recno/rec_open.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/recno/rec_put.c (renamed from src/util/db2/recno/rec_put.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/recno/rec_search.c (renamed from src/util/db2/recno/rec_search.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/recno/rec_seq.c (renamed from src/util/db2/recno/rec_seq.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/recno/rec_utils.c (renamed from src/util/db2/recno/rec_utils.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/recno/recno.h (renamed from src/util/db2/recno/recno.h) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/ChangeLog (renamed from src/util/db2/test/ChangeLog) | 4 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/Makefile.in (renamed from src/util/db2/test/Makefile.in) | 4 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/README (renamed from src/util/db2/test/README) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/SEQ_TEST/data (renamed from src/util/db2/test/SEQ_TEST/data) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/SEQ_TEST/mbox (renamed from src/util/db2/test/SEQ_TEST/mbox) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/SEQ_TEST/t.c (renamed from src/util/db2/test/SEQ_TEST/t.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/btree.tests/ChangeLog (renamed from src/util/db2/test/btree.tests/ChangeLog) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/btree.tests/main.c (renamed from src/util/db2/test/btree.tests/main.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/dbtest.c (renamed from src/util/db2/test/dbtest.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/dictionary (renamed from src/util/db2/test/dictionary) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/hash1.tests/Makefile (renamed from src/util/db2/test/hash1.tests/Makefile) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/hash1.tests/driver2.c (renamed from src/util/db2/test/hash1.tests/driver2.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/hash1.tests/makedb.sh (renamed from src/util/db2/test/hash1.tests/makedb.sh) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/hash1.tests/tcreat3.c (renamed from src/util/db2/test/hash1.tests/tcreat3.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/hash1.tests/tdel.c (renamed from src/util/db2/test/hash1.tests/tdel.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/hash1.tests/testit (renamed from src/util/db2/test/hash1.tests/testit) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/hash1.tests/thash4.c (renamed from src/util/db2/test/hash1.tests/thash4.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/hash1.tests/tread2.c (renamed from src/util/db2/test/hash1.tests/tread2.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/hash1.tests/tseq.c (renamed from src/util/db2/test/hash1.tests/tseq.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/hash1.tests/tverify.c (renamed from src/util/db2/test/hash1.tests/tverify.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/hash2.tests/README (renamed from src/util/db2/test/hash2.tests/README) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/hash2.tests/bigtest.c (renamed from src/util/db2/test/hash2.tests/bigtest.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/hash2.tests/passtest.c (renamed from src/util/db2/test/hash2.tests/passtest.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/hash2.tests/passwd/genpass.c (renamed from src/util/db2/test/hash2.tests/passwd/genpass.c) | 0 | ||||
-rw-r--r-- | src/modules/kdb/db2/libdb2/test/run.test (renamed from src/util/db2/test/run.test) | 0 | ||||
-rw-r--r-- | src/util/ChangeLog | 6 | ||||
-rw-r--r-- | src/util/Makefile.in | 4 |
123 files changed, 56 insertions, 26 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b8c19b0..15ed1e2 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 5b78d37..68ec28c 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 ec784f9..23c4afc 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 5b8cf6b..cf1763e 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 44c6540..234c1cc 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 abd05f9..abd05f9 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 83fe66a..617a075 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 37542ae..75553ed 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 77af9c5..77af9c5 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 70118be..70118be 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 112454e..112454e 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 5700b73..5700b73 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 d3b0265..11f4c84 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 8ed7649..8ed7649 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 11be134..11be134 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 6cfa216..6cfa216 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 d36256b..d36256b 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 d002a66..d002a66 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 b631821..b631821 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 3e4c67a..3e4c67a 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 8b1f597..8b1f597 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 3663cf7..3663cf7 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 f75ca92..f75ca92 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 de7ab12..de7ab12 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 bbfb9c6..bbfb9c6 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 0cc6cf0..0cc6cf0 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 1a34598..1a34598 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 1717127..1717127 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 3aa8841..3aa8841 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 3f3d2b8..c5ab559 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 f9bf650..f9bf650 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 71dc7d1..71dc7d1 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 0a509f7..0a509f7 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 dadaa48..dadaa48 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 b173b0d..9c7d7c2 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 59478ba..59478ba 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 fba7795..fba7795 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 c79c972..c79c972 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 c621bef..c621bef 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 18303cf..18303cf 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 acdea09..acdea09 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 5b5ba6e..5b5ba6e 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 816c924..816c924 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 8ffccfc..8ffccfc 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 e8cbe63..0e3b1ad 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 87746f7..87746f7 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 58c9df7..58c9df7 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 872b6b0..872b6b0 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 0e25493..0e25493 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 b72cc0d..b72cc0d 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 b202fc9..b202fc9 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 06210a5..06210a5 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 69229fc..69229fc 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 1dee694..1dee694 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 8c710e5..8c710e5 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 e25115d..e25115d 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 02ff7ef..02ff7ef 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 8ef8a2e..8ef8a2e 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 4a0311f..4a0311f 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 6d6a0a8..6d6a0a8 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 676bbd4..676bbd4 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 bcd7991..bcd7991 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 28c9378..28c9378 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 bbb2292..bbb2292 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 e99f46f..e99f46f 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 40d32cc..40d32cc 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 980145a..980145a 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 5dbc2e4..5dbc2e4 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 f85cba1..f85cba1 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 23feea6..23feea6 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 25e289f..25e289f 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 adb88fc..adb88fc 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 b18a38c..b18a38c 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 34c4d1f..34c4d1f 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 4b683b6..4b683b6 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 f988ef9..f988ef9 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 6b93b3f..6b93b3f 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 18ad646..18ad646 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 794b00b..794b00b 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 6f487ee..e40c161 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 93210c8..93210c8 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 0f01fbc..0f01fbc 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 d172f71..d172f71 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 627ad5b..627ad5b 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 6726227..e90a7cb 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 e49e225..e49e225 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 98e382c..98e382c 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 ed3da6e..ed3da6e 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 b69c9ad..b69c9ad 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 230b2d4..230b2d4 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 f18a1cb..f18a1cb 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 e7fa758..e7fa758 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 a328f1b..a328f1b 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 1edaa99..1edaa99 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 f757a72..f757a72 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 bec772c..bec772c 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 cfcce7d..aad74b4 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 18d366c..5df1d2f 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 0c0cd13..0c0cd13 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 37a5185..37a5185 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 9d5d49d..9d5d49d 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 f77b676..f77b676 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 339db61..339db61 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 06f02b3..06f02b3 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 10a89a6..10a89a6 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 53640f0..53640f0 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 348a8f8..348a8f8 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 6a3b432..6a3b432 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 15901de..15901de 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 f11487b..f11487b 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 8266114..8266114 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 c80dc4e..c80dc4e 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 b15b617..b15b617 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 1e2cc4c..1e2cc4c 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 d2d3686..d2d3686 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 4747804..4747804 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 f29ccf7..f29ccf7 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 81c559a..81c559a 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 adb72c0..adb72c0 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 da37676..da37676 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 48c3a63..48c3a63 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 47761a1..56872ae 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 ecad6b2..c9fd1d8 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@ |