If configure scripts set build_dynobj=yes, force build of shared objects and

not static objects; set it in the db2 directories.  Fix up some bugs in Mac
support just checked in for building plugin modules.

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

6 files changed, 14 insertions, 4 deletions

diff --git a/src/modules/kdb/db2/ChangeLog b/src/modules/kdb/db2/ChangeLog
index d2dcbe18f..22537d4eb 100644
--- a/src/modules/kdb/db2/ChangeLog
+++ b/src/modules/kdb/db2/ChangeLog
@@ -1,6 +1,8 @@
 2005-10-27  Ken Raeburn  <raeburn@mit.edu>
 
-	* Makefile.in (DYNOBJ_LOADER_PROG, DYNOBJ_EXPFLAGS_WITH_LOADER,
+	* configure.in: Set build_dynobj=yes.
+
+	* Makefile.in (DYNOBJ_LOADER_PROG, DYNOBJ_EXPLIBS_WITH_LOADER,
 	DYNOBJ_EXPDEPS_WITH_LOADER): New variables.
 
 2005-10-13  Ken Raeburn  <raeburn@mit.edu>
diff --git a/src/modules/kdb/db2/Makefile.in b/src/modules/kdb/db2/Makefile.in
index 67662bf34..465a95497 100644
--- a/src/modules/kdb/db2/Makefile.in
+++ b/src/modules/kdb/db2/Makefile.in
@@ -63,7 +63,7 @@ STLIBOBJS= \
 	db2_exp.o
 
 DYNOBJ_LOADER_PROG = $(BUILDTOP)/kdc/krb5kdc
-DYNOBJ_EXPFLAGS_WITH_LOADER = -lgssrpc $(KDB5_DB_LIB)
+DYNOBJ_EXPLIBS_WITH_LOADER = -lgssrpc $(KDB5_DB_LIB)
 DYNOBJ_EXPDEPS_WITH_LOADER = $(GSSRPC_DEPLIBS)
 
 all-unix:: $(LIBBASE)$(SO_EXT)
diff --git a/src/modules/kdb/db2/configure.in b/src/modules/kdb/db2/configure.in
index 234c1cc0a..9f958db12 100644
--- a/src/modules/kdb/db2/configure.in
+++ b/src/modules/kdb/db2/configure.in
@@ -1,5 +1,6 @@
 K5_AC_INIT(configure.in)
 enable_shared=yes
+build_dynobj=yes
 CONFIG_RULES
 AC_CHECK_HEADERS(unistd.h)
 AC_TYPE_MODE_T
diff --git a/src/modules/kdb/db2/libdb2/ChangeLog b/src/modules/kdb/db2/libdb2/ChangeLog
index 617a075eb..c7e92cfa2 100644
--- a/src/modules/kdb/db2/libdb2/ChangeLog
+++ b/src/modules/kdb/db2/libdb2/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-27  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Set build_dynobj=yes.
+
+	* Makefile.in (all-unix, clean-unix): Drop liblinks dependencies.
+
 2005-10-04  Ken Raeburn  <raeburn@mit.edu>
 
 	* Directory moved from util/db2 to modules/kdb/db2/libdb2.
diff --git a/src/modules/kdb/db2/libdb2/Makefile.in b/src/modules/kdb/db2/libdb2/Makefile.in
index 75553edf3..693773e67 100644
--- a/src/modules/kdb/db2/libdb2/Makefile.in
+++ b/src/modules/kdb/db2/libdb2/Makefile.in
@@ -15,9 +15,9 @@ RELDIR=../modules/kdb/db2/libdb2
 HDRDIR=$(BUILDTOP)/include
 HDRS =	$(HDRDIR)/db.h $(HDRDIR)/db-config.h $(HDRDIR)/db-ndbm.h
 
-all-unix:: all-liblinks includes
+all-unix:: includes
 all-prerecurse: include/config.h include/db-config.h
-clean-unix:: clean-liblinks clean-libs clean-includes
+clean-unix:: clean-libs clean-includes
 
 includes:: $(HDRS)
 
diff --git a/src/modules/kdb/db2/libdb2/configure.in b/src/modules/kdb/db2/libdb2/configure.in
index dadaa48df..9a339b0bb 100644
--- a/src/modules/kdb/db2/libdb2/configure.in
+++ b/src/modules/kdb/db2/libdb2/configure.in
@@ -1,6 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 K5_AC_INIT(db/db.c)
 AC_CONFIG_HEADER(include/config.h include/db-config.h)
+build_dynobj=yes
 CONFIG_RULES
 
 AC_PATH_PROG(FALSE,false,:)