diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/kdb/db2/ChangeLog | 5 | ||||
| -rw-r--r-- | src/modules/kdb/db2/Makefile.in | 16 | ||||
| -rw-r--r-- | src/modules/kdb/db2/libdb2/test/ChangeLog | 1 | ||||
| -rw-r--r-- | src/modules/kdb/db2/libdb2/test/Makefile.in | 3 |
4 files changed, 22 insertions, 3 deletions
diff --git a/src/modules/kdb/db2/ChangeLog b/src/modules/kdb/db2/ChangeLog index 23c4afcd7..604408602 100644 --- a/src/modules/kdb/db2/ChangeLog +++ b/src/modules/kdb/db2/ChangeLog @@ -5,8 +5,11 @@ used. * Makefile.in (DBDIR): Updated. ($(DB_DEPS)): Depend on all-recurse. + (DB_VERSION, DB_DEPS, DB_DEPS-sys, DB_DEPS-k5, DB_DEPS-redirect, + DB_LIB, KDB5_DB_LIB, DB_DEPLIB, DB_DEPLIB-k5, DB_DEPLIB-sys): + Variable definitions moved here from config/pre.in. - * Makefile.in (SHLIB_EXPLIBS): Only use gssrpc. + * Makefile.in (SHLIB_EXPLIBS): Only use gssrpc and KDB5_DB_LIB. * configure.in: Set enable_shared=yes. * kdb_xdr.c (krb5_dbe_create_key_data, krb5_dbe_update_tl_data, diff --git a/src/modules/kdb/db2/Makefile.in b/src/modules/kdb/db2/Makefile.in index cf1763e24..9f6017796 100644 --- a/src/modules/kdb/db2/Makefile.in +++ b/src/modules/kdb/db2/Makefile.in @@ -9,6 +9,17 @@ PROG_RPATH=$(KRB5_LIBDIR) LOCALINCLUDES = -I../../../lib/kdb -I$(srcdir)/../../../lib/kdb +DB_VERSION = @DB_VERSION@ +DB_DEPS = $(DB_DEPS-@DB_HEADER_VERSION@) +DB_DEPS-sys = +DB_DEPS-k5 = $(BUILDTOP)/include/db.h $(BUILDTOP)/include/db-config.h +DB_DEPS-redirect = $(BUILDTOP)/include/db.h +DB_LIB = @DB_LIB@ +KDB5_DB_LIB = @KDB5_DB_LIB@ +DB_DEPLIB = $(DB_DEPLIB-@DB_VERSION@) +DB_DEPLIB-k5 = $(TOPLIBD)/libdb$(DEPLIBEXT) +DB_DEPLIB-sys = + LIBBASE=db2 LIBMAJOR=0 LIBMINOR=0 @@ -20,8 +31,9 @@ SHLIB_EXPDEPS = \ $(GSSRPC_DEPLIBS) \ $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ $(TOPLIBD)/libkrb5$(SHLIBEXT) -SHLIB_EXPLIBS= -lgssrpc # $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) \ - $(SUPPORT_LIB) $(LIBS) +SHLIB_EXPLIBS= -lgssrpc $(KDB5_DB_LIB) +# $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) $(SUPPORT_LIB) $(LIBS) + SHLIB_DIRS=-L$(TOPLIBD) SHLIB_RDIRS=$(KRB5_LIBDIR) diff --git a/src/modules/kdb/db2/libdb2/test/ChangeLog b/src/modules/kdb/db2/libdb2/test/ChangeLog index aad74b4c7..fbd5dcccb 100644 --- a/src/modules/kdb/db2/libdb2/test/ChangeLog +++ b/src/modules/kdb/db2/libdb2/test/ChangeLog @@ -1,6 +1,7 @@ 2005-10-04 Ken Raeburn <raeburn@mit.edu> * Makefile.in (BUILDTOP, myfulldir): Updated for directory move. + (DB_LIB, DB_DEPLIB): Define here now. 2004-08-27 Ken Raeburn <raeburn@mit.edu> diff --git a/src/modules/kdb/db2/libdb2/test/Makefile.in b/src/modules/kdb/db2/libdb2/test/Makefile.in index 5df1d2f60..3b9253de7 100644 --- a/src/modules/kdb/db2/libdb2/test/Makefile.in +++ b/src/modules/kdb/db2/libdb2/test/Makefile.in @@ -14,6 +14,9 @@ PROG_RPATH=$(KRB5_LIBDIR) KRB5_RUN_ENV= @KRB5_RUN_ENV@ +DB_LIB = -ldb +DB_DEPLIB = $(TOPLIBD)/libdb$(DEPLIBEXT) + all:: dbtest: dbtest.o $(DB_DEPLIB) |