+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.
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)
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.
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 \
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@
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
+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.
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
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
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
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
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
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
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
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
+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
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=.
+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.
##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@