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

diff --git a/src/ChangeLog b/src/ChangeLog
index d0e7d2eb10e151755dfcb7a0f501ef6edb38d4b4..0fd3139af9c00677cc79207ded614b43ad5a2a02 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
        * aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Substitute
        DYNOBJ_EXPDEPS and DYNOBJ_EXPFLAGS.
+       (KRB5_LIB_AUX): If build_dynobj is set to yes, ensure that OBJS.SH
+       is in OBJLISTS and that OBJS.ST is not.
 
 2005-10-26  Ken Raeburn  <raeburn@mit.edu>
 

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 13e3d527f6d2429629936d368c0075865459df2e..4041a8107e4a3eb09082abeeda2911ecc9a16932 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1327,6 +1327,11 @@ else
        SHLIBSEXT=.so.s-nobuild
 fi
 
+if test "$build_dynobj" = yes; then
+       OBJLISTS=`echo $OBJLISTS | sed -e s/OBJS.ST//g -e s/OBJS.SH//g`
+       OBJLISTS="$OBJLISTS OBJS.SH"
+fi
+
 if test -z "$LIBLIST"; then
        AC_MSG_ERROR([must enable one of shared or static libraries])
 fi

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 43609e070218e4a6da37bb680f52aa71af0768ca..7471e1fbdb5c54fd99f36dcc8e45bed80bc42b7f 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,5 +1,10 @@
 2005-10-27  Ken Raeburn  <raeburn@mit.edu>
 
+       * libnover.in (LIBLIST): Use DYNOBJEXT instead of SHLIBEXT.
+       * shlib.conf (*-*-darwin*): Include SHLIB_DIRS, and
+       DYNOBJ_EXPLIBS_WITH_LOADER instead of
+       DYNOBJ_EXPFLAGS_WITH_LOADER.
+
        * post.in (.depend): Don't run sed, just use perl.  Use new name
        of perl script.
 

diff --git a/src/config/libnover.in b/src/config/libnover.in
index 79b8e9f8f49292b3a0dfdcbe5b0423e76b1095f8..3896e8462c2c12cbf3ac92bcba1fef0f54bd2d03 100644 (file)
--- a/src/config/libnover.in
+++ b/src/config/libnover.in
@@ -34,7 +34,7 @@ dummy-target-1 $(SUBDIROBJLISTS) $(SUBDIROBJLISTS:.ST=.SH) $(SUBDIROBJLISTS:.ST=
 PARSE_OBJLISTS= set -x && $(PERL) -p -e 'BEGIN { $$SIG{__WARN__} = sub {die @_} }; $$e=$$ARGV; $$e =~ s/OBJS\...$$//; s/^/ /; s/ $$//; s/ / $$e/g;'
 
 SHLIBVEXT=$(SHLIBEXT)
-LIBLIST=$(LIBBASE)$(SHLIBEXT)
+LIBLIST=$(LIBBASE)$(DYNOBJEXT)
 LIBINSTLIST=install-shared
 
 $(LIBBASE)$(DYNOBJEXT): $(SHOBJLISTS) $(DYNOBJ_EXPDEPS) $(SHLIB_EXPORT_FILE_DEP)

diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index 6ebbbf684e84f620b079de7ce048fad0d86523d4..cc42c75be9abee2f4675195cf024f2ffc56dcda6 100644 (file)
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -282,7 +282,7 @@ mips-*-netbsd*)
        DYNOBJEXT=.so
        SHLIB_EXPORT_FILE_DEP=darwin.exports
        DYNOBJ_EXPDEPS='$(DYNOBJ_EXPDEPS_WITH_LOADER)'
-       DYNOBJ_EXPFLAGS='$(DYNOBJ_EXPFLAGS_WITH_LOADER)'
+       DYNOBJ_EXPFLAGS='$(SHLIB_DIRS) $(DYNOBJ_EXPLIBS_WITH_LOADER)'
        MAKE_DYNOBJ_COMMAND='$(CC) -bundle $(CFLAGS) -bundle_loader $(DYNOBJ_LOADER_PROG) $(LDFLAGS) -o $@ $$objlist $(DYNOBJ_EXPFLAGS) -exported_symbols_list darwin.exports'
        LDCOMBINE='$(CC) -undefined warning -dynamiclib -compatibility_version $(LIBMAJOR) -current_version $(LIBMAJOR).$(LIBMINOR) -install_name "$(KRB5_LIBDIR)/$(LIBPREFIX)$(LIBBASE)$(SHLIBVEXT)" $(CFLAGS) $(LDFLAGS)'
        CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(CFLAGS) $(LDFLAGS)'

diff --git a/src/modules/kdb/db2/ChangeLog b/src/modules/kdb/db2/ChangeLog
index d2dcbe18fd0942edceb89f9323109d106f7d9fe3..22537d4eb683e084d9e142ba635551e90ed3ccb9 100644 (file)
--- 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 67662bf34abc2eb04c6b37d3e8dbe7ed8eb97bd9..465a9549786d1dcc58b13736a40c8531e546a400 100644 (file)
--- 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 234c1cc0a2c67474d91d02cc235bb33bd4c599b0..9f958db122f9f4e7561d70aac44cf6d3ff691319 100644 (file)
--- 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 617a075eb3a10c853239782ee748241ea37ae288..c7e92cfa2dec299994d69c67a5d350c2c6009e34 100644 (file)
--- 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 75553edf3a9a5a2845461c9d4ece950be53f65bb..693773e67ae47219ec31269133817e48ba0c9f78 100644 (file)
--- 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 dadaa48df0d4d10f14d3bdc0e700451bdcf5a3ff..9a339b0bbe2e97d722bd8c69b8ee90a2cd33528d 100644 (file)
--- 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,:)