Move libdb2 makefile stuff down into db2 module subtree.

Some steps towards making module build on Darwin, not there yet.

* aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Substitute DYNOBJEXT and
MAKE_DYNOBJ_COMMAND.
(KRB5_LIB_AUX): Don't define _KDB5_STATIC_LINK.

* config/libnover.in (darwin.exports): New target.
($(LIBBASE)$(DYNOBJEXT)): New target, instead of $(LIBBASE)$(SHLIBVEXT).
(all-libs): Build $(LIBBASE)$(DYNOBJEXT).
(install-shared): Use DYNOBJEXT.

* config/pre.in (DYNOBJEXT, MAKE_DYNOBJ_COMMAND): New variables.
* config/shlib.conf: Set DYNOBJEXT, MAKE_DYNOBJ_COMMAND to the SHLIB versions.
For Darwin, set them to create a .so bundle, and set SHLIB_EXPORT_FILE_DEP to
darwin.exports.

* config/pre.in (DB_DEPLIB, DB_DEPLIB-k5, DB_DEPLIB-sys, DB_VERSION, DB_DEPS,
DB_DEPS-sys, DB_DEPS-k5, DB_DEPS-redirect, DB_LIB, KDB5_DB_LIB): Variables
deleted.
(KDB5_LIBS): Set to just $(KDB5_LIB).

* modules/kdb/db2/Makefile.in (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.
(SHLIB_EXPLIBS): Only use gssrpc and KDB5_DB_LIB.

* modules/kdb/db2/libdb2/test/Makefile.in (DB_LIB, DB_DEPLIB): Define here now.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17408 dc483132-0cff-0310-8789-dd5450dbe970

4 files changed, 22 insertions, 3 deletions

diff --git a/src/modules/kdb/db2/ChangeLog b/src/modules/kdb/db2/ChangeLog
index 23c4afcd78..6044086024 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 cf1763e244..9f60177962 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 aad74b4c77..fbd5dcccb8 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 5df1d2f600..3b9253de76 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)