From: Tom Yu Date: Fri, 30 Jun 2000 21:55:07 +0000 (+0000) Subject: * configure.in: Rework to use krb5 build system X-Git-Tag: krb5-1.3-alpha1~2050 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=113db43ddf5e2d15f485ebc30bc416c6c2fab827;p=krb5.git * configure.in: Rework to use krb5 build system * Makefile.in: Rework to use krb5 build system. * btree/Makefile.in: New file. * clib/Makefile.in: New file. * db/Makefile.in: New file. * mpool/Makefile.in: New file. * recno/Makefile.in: New file. * test/Makefile.in: New file. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12487 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/util/db2/ChangeLog b/src/util/db2/ChangeLog index ed61aeeda..937a35256 100644 --- a/src/util/db2/ChangeLog +++ b/src/util/db2/ChangeLog @@ -1,3 +1,21 @@ +2000-06-30 Tom Yu + + * configure.in: Rework to use krb5 build system. + + * Makefile.in: Rework to use krb5 build system. + + * btree/Makefile.in: New file. + + * clib/Makefile.in: New file. + + * db/Makefile.in: New file. + + * mpool/Makefile.in: New file. + + * recno/Makefile.in: New file. + + * test/Makefile.in: New file. + 2000-06-26 Ken Raeburn * btree/bt_put.c (__bt_put): Initialize "e". diff --git a/src/util/db2/Makefile.in b/src/util/db2/Makefile.in index 09e3d128c..d1b3e6541 100644 --- a/src/util/db2/Makefile.in +++ b/src/util/db2/Makefile.in @@ -1,16 +1,16 @@ -SHELL = /bin/sh +thisconfigdir=. +myfulldir=util/db2 +mydir=. +BUILDTOP=$(REL)$(U)$(S)$(U) +LOCAL_SUBDIRS=hash btree db mpool recno clib test -SUBDIRS = obj +LIB=db +LIBMAJOR=1 +LIBMINOR=0 +STOBJLISTS=hash/OBJS.ST btree/OBJS.ST db/OBJS.ST mpool/OBJS.ST \ + recno/OBJS.ST +RELDIR=../util/db2 -all clean distclean realclean check:: - for i in ${SUBDIRS}; do (cd $$i; ${MAKE} $@) || exit 1; done - -distclean:: - rm -rf config.status config.log config.cache db-config.h - -install:: - -Makefiles:: - -realclean:: - rm -rf configure db-config.h.in +all-unix:: all-liblinks +clean-unix:: clean-liblinks clean-libs +install-unix:: install-libs diff --git a/src/util/db2/btree/Makefile.in b/src/util/db2/btree/Makefile.in new file mode 100644 index 000000000..f61521c5f --- /dev/null +++ b/src/util/db2/btree/Makefile.in @@ -0,0 +1,13 @@ +thisconfigdir=./.. +myfulldir=util/db2/btree +mydir=btree +BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U) +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 + +LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \ + -I$(srcdir)/../db + +all-unix:: all-libobjs +clean-unix:: clean-libobjs diff --git a/src/util/db2/clib/Makefile.in b/src/util/db2/clib/Makefile.in new file mode 100644 index 000000000..9850a7d4d --- /dev/null +++ b/src/util/db2/clib/Makefile.in @@ -0,0 +1,8 @@ +thisconfigdir=./.. +myfulldir=util/db2/clib +mydir=clib +BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U) +STLIBOBJS=@MEMMOVE_OBJ@ @MKSTEMP_OBJ@ @STRERROR_OBJ@ + +all-unix:: all-libobjs +clean-unix:: clean-libobjs diff --git a/src/util/db2/configure.in b/src/util/db2/configure.in index 3f6c5c086..c61a8fbfd 100644 --- a/src/util/db2/configure.in +++ b/src/util/db2/configure.in @@ -1,9 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(db/db.c) -AC_CONFIG_HEADER(obj/db-config.h) -dnl checks for programs -AC_PROG_CC -AC_PROG_RANLIB +AC_CONFIG_HEADER(include/db-config.h) +CONFIG_RULES AC_PATH_PROG(FALSE,false,:) AC_PATH_PROG(SH,sh,$FALSE) @@ -68,13 +66,35 @@ dnl checks for compiler characteristics AC_C_BIGENDIAN AC_C_CONST AC_CHECK_SIZEOF(int) + dnl checks for library functions -AC_CHECK_FUNC(memmove,,MEMMOVE_OBJ=memmove.o) -AC_CHECK_FUNC(mkstemp,,MKSTEMP_OBJ=mkstemp.o) -AC_CHECK_FUNC(strerror,,STRERROR_OBJ=strerror.o) +AC_CHECK_FUNC(memmove,, +[MEMMOVE_OBJ=memmove.o +ADD_DEF(-Dmemmove=kdb2__memmove) +ADD_DEF(-DMEMMOVE)]) + +AC_CHECK_FUNC(mkstemp,, +[MKSTEMP_OBJ=mkstemp.o +ADD_DEF(-Dmkstemp=kdb2__mkstemp)]) +AC_CHECK_FUNC(strerror,, +[STRERROR_OBJ=strerror.o +ADD_DEF(-Dstrerror=kdb2__strerror)]) + AC_SUBST(MEMMOVE_OBJ) AC_SUBST(MKSTEMP_OBJ) AC_SUBST(STRERROR_OBJ) AC_CHECK_FUNCS(memmove mkstemp strerror) -dnl checks for system services -AC_OUTPUT(Makefile obj/Makefile) + +KRB5_BUILD_LIBRARY +KRB5_BUILD_LIBOBJS +KRB5_BUILD_PROGRAM +KRB5_RUN_FLAGS +K5_GEN_MAKEFILE(., lib) +K5_GEN_MAKEFILE(hash, libobj) +K5_GEN_MAKEFILE(btree, libobj) +K5_GEN_MAKEFILE(db, libobj) +K5_GEN_MAKEFILE(mpool, libobj) +K5_GEN_MAKEFILE(recno, libobj) +K5_GEN_MAKEFILE(clib, libobj) +K5_GEN_MAKEFILE(test) +K5_AC_OUTPUT diff --git a/src/util/db2/db/Makefile.in b/src/util/db2/db/Makefile.in new file mode 100644 index 000000000..89e268941 --- /dev/null +++ b/src/util/db2/db/Makefile.in @@ -0,0 +1,10 @@ +thisconfigdir=./.. +myfulldir=util/db2/db +mydir=db +BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U) +STLIBOBJS=db.o + +LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool + +all-unix:: all-libobjs +clean-unix:: clean-libobjs diff --git a/src/util/db2/hash/Makefile.in b/src/util/db2/hash/Makefile.in new file mode 100644 index 000000000..24af09ab3 --- /dev/null +++ b/src/util/db2/hash/Makefile.in @@ -0,0 +1,12 @@ +thisconfigdir=./.. +myfulldir=util/db2/hash +mydir=hash +BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U) +STLIBOBJS= hash.o hash_bigkey.o hash_debug.o hash_func.o hash_log2.o \ + hash_page.o hsearch.o dbm.o + +LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \ + -I$(srcdir)/../db + +all-unix:: all-libobjs +clean-unix:: clean-libobjs diff --git a/src/util/db2/mpool/Makefile.in b/src/util/db2/mpool/Makefile.in new file mode 100644 index 000000000..9e18d623a --- /dev/null +++ b/src/util/db2/mpool/Makefile.in @@ -0,0 +1,10 @@ +thisconfigdir=./.. +myfulldir=util/db2/mpool +mydir=mpool +BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U) +STLIBOBJS=mpool.o + +LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../db + +all-unix:: all-libobjs +clean-unix:: clean-libobjs diff --git a/src/util/db2/recno/Makefile.in b/src/util/db2/recno/Makefile.in new file mode 100644 index 000000000..23868ce6e --- /dev/null +++ b/src/util/db2/recno/Makefile.in @@ -0,0 +1,12 @@ +thisconfigdir=./.. +myfulldir=util/db2/recno +mydir=recno +BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U) +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 + +LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \ + -I$(srcdir)/../db + +all-unix:: all-libobjs +clean-unix:: clean-libobjs diff --git a/src/util/db2/test/Makefile.in b/src/util/db2/test/Makefile.in new file mode 100644 index 000000000..0b9c2907b --- /dev/null +++ b/src/util/db2/test/Makefile.in @@ -0,0 +1,23 @@ +thisconfigdir=./.. +myfulldir=util/db2/test +mydir=test +BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U) + +FCTSH = @FCTSH@ +TMPDIR=. + +LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \ + -I$(srcdir)/../db + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +KRB5_RUN_ENV= @KRB5_RUN_ENV@ + +all:: + +dbtest: dbtest.o $(DB_DEPLIB) + $(CC_LINK) -o $@ dbtest.o $(STRERROR_OBJ) $(DB_LIB) + +check:: dbtest + $(KRB5_RUN_ENV) srcdir=$(srcdir) TMPDIR=$(TMPDIR) $(FCTSH) $(srcdir)/run.test