Allow dynamic-object dependencies and build flags to be specified as distinct from

shared-library dependencies and flags.  Define them for the Mac, default to same as
shared-library versions on other platforms.

* config/shlib.conf: Set DYNOBJ_EXPDEPS and DYNOBJ_EXPFLAGS.
(*-*-darwin*): Change MAKE_DYNOBJ_COMMAND definition to use DYNOBJ_EXPFLAGS and
DYNOBJ_LOADER_PROG instead of SHLIB_EXPFLAGS and a hardcoded pathname to the KDC binary,
respectively.
* config/pre.in (DYNOBJ_EXPDEPS, DYNOBJ_EXPFLAGS): New variables.
* config/libnover.in ($(LIBBASE)$(DYNOBJEXT)): Use DYNOBJ_EXPDEPS instead of SHLIB_EXPDEPS
in dependencies.
* aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Substitute DYNOBJ_EXPDEPS and DYNOBJ_EXPFLAGS.
* modules/kdb/db2/Makefile.in (DYNOBJ_LOADER_PROG, DYNOBJ_EXPFLAGS_WITH_LOADER,
DYNOBJ_EXPDEPS_WITH_LOADER): New variables.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 670162146e0403c699678dc80961291891c198eb..d0e7d2eb10e151755dfcb7a0f501ef6edb38d4b4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-27  Ken Raeburn  <raeburn@mit.edu>
+
+       * aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Substitute
+       DYNOBJ_EXPDEPS and DYNOBJ_EXPFLAGS.
+
 2005-10-26  Ken Raeburn  <raeburn@mit.edu>
 
        * aclocal.m4 (KRB5_AC_INET6): Drop enable/disable-ipv6 option;

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 90c0ecdfa72840baa3df20a907c24aa348646142..13e3d527f6d2429629936d368c0075865459df2e 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1192,6 +1192,8 @@ AC_SUBST(LIBLINKS)
 AC_SUBST(MAKE_SHLIB_COMMAND)
 AC_SUBST(SHLIB_EXPFLAGS)
 AC_SUBST(SHLIB_EXPORT_FILE_DEP)
+AC_SUBST(DYNOBJ_EXPDEPS)
+AC_SUBST(DYNOBJ_EXPFLAGS)
 AC_SUBST(INSTALL_SHLIB)
 AC_SUBST(STLIBEXT)
 AC_SUBST(SHLIBEXT)

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 99addf6dc938c768bdc65008dce47ed34eb53371..c30b6896d30b89c935690b05662788c17b1707eb 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-27  Ken Raeburn  <raeburn@mit.edu>
+
+       * shlib.conf: Set DYNOBJ_EXPDEPS and DYNOBJ_EXPFLAGS.
+       (*-*-darwin*): Change MAKE_DYNOBJ_COMMAND definition to use
+       DYNOBJ_EXPFLAGS and DYNOBJ_LOADER_PROG instead of SHLIB_EXPFLAGS
+       and a hardcoded pathname to the KDC binary, respectively.
+       * pre.in (DYNOBJ_EXPDEPS, DYNOBJ_EXPFLAGS): New variables.
+       * libnover.in ($(LIBBASE)$(DYNOBJEXT)): Use DYNOBJ_EXPDEPS instead
+       of SHLIB_EXPDEPS in dependencies.
+
 2005-10-12  Ken Raeburn  <raeburn@mit.edu>
 
        * libnover.in (PARSE_OBJLISTS): Die on warnings (including input

diff --git a/src/config/libnover.in b/src/config/libnover.in
index 4ce74b6ca1ef65aa6c17658e2116912dbac2490b..79b8e9f8f49292b3a0dfdcbe5b0423e76b1095f8 100644 (file)
--- a/src/config/libnover.in
+++ b/src/config/libnover.in
@@ -37,7 +37,7 @@ SHLIBVEXT=$(SHLIBEXT)
 LIBLIST=$(LIBBASE)$(SHLIBEXT)
 LIBINSTLIST=install-shared
 
-$(LIBBASE)$(DYNOBJEXT): $(SHOBJLISTS) $(SHLIB_EXPDEPS) $(SHLIB_EXPORT_FILE_DEP)
+$(LIBBASE)$(DYNOBJEXT): $(SHOBJLISTS) $(DYNOBJ_EXPDEPS) $(SHLIB_EXPORT_FILE_DEP)
        $(RM) $@
        @echo "building dynamic $(LIBBASE) object"
        set -x; objlist=`$(PARSE_OBJLISTS) $(SHOBJLISTS)` && $(MAKE_DYNOBJ_COMMAND)

diff --git a/src/config/pre.in b/src/config/pre.in
index d4e270e344876c39e9f0bd4b87c82c6c8405f6f3..2dcba6c2c066e52818385af331f38b17ba514b9b 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -492,6 +492,8 @@ PFLIBEXT=@PFLIBEXT@
 #
 DYNOBJEXT=@DYNOBJEXT@
 MAKE_DYNOBJ_COMMAND=@MAKE_DYNOBJ_COMMAND@
+DYNOBJ_EXPDEPS=@DYNOBJ_EXPDEPS@
+DYNOBJ_EXPFLAGS=@DYNOBJ_EXPFLAGS@
 
 # File with symbol names to be exported, both functions and data,
 # currently not distinguished.

diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index 04ed7724234f0ba58be9f61d4506b14d75879787..6ebbbf684e84f620b079de7ce048fad0d86523d4 100644 (file)
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -14,6 +14,8 @@ INSTALL_SHLIB='$(INSTALL_DATA)'
 # loadable objects.
 DYNOBJEXT='$(SHLIBEXT)'
 MAKE_DYNOBJ_COMMAND='$(MAKE_SHLIB_COMMAND)'
+DYNOBJ_EXPDEPS='$(SHLIB_EXPDEPS)'
+DYNOBJ_EXPFLAGS='$(SHLIB_EXPFLAGS)'
 #
 use_linker_init_option=no
 use_linker_fini_option=no
@@ -279,7 +281,9 @@ mips-*-netbsd*)
        SHLIBEXT=.dylib
        DYNOBJEXT=.so
        SHLIB_EXPORT_FILE_DEP=darwin.exports
-       MAKE_DYNOBJ_COMMAND='$(CC) -bundle $(CFLAGS) -bundle_loader $(BUILDTOP)/kdc/krb5kdc $(LDFLAGS) -o $@ $$objlist $(SHLIB_EXPFLAGS) -exported_symbols_list darwin.exports'
+       DYNOBJ_EXPDEPS='$(DYNOBJ_EXPDEPS_WITH_LOADER)'
+       DYNOBJ_EXPFLAGS='$(DYNOBJ_EXPFLAGS_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)'
        CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'

diff --git a/src/modules/kdb/db2/ChangeLog b/src/modules/kdb/db2/ChangeLog
index e801f6919a2cd501b776c258d626996ec7097a95..d2dcbe18fd0942edceb89f9323109d106f7d9fe3 100644 (file)
--- a/src/modules/kdb/db2/ChangeLog
+++ b/src/modules/kdb/db2/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-27  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (DYNOBJ_LOADER_PROG, DYNOBJ_EXPFLAGS_WITH_LOADER,
+       DYNOBJ_EXPDEPS_WITH_LOADER): New variables.
+
 2005-10-13  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (SHLIB_EXPLIBS): Revert 10-04 change; add support

diff --git a/src/modules/kdb/db2/Makefile.in b/src/modules/kdb/db2/Makefile.in
index a22b383bcd0932c0fa3b3f4a9c367fbadeee8fd5..67662bf34abc2eb04c6b37d3e8dbe7ed8eb97bd9 100644 (file)
--- a/src/modules/kdb/db2/Makefile.in
+++ b/src/modules/kdb/db2/Makefile.in
@@ -62,6 +62,10 @@ STLIBOBJS= \
        pol_xdr.o \
        db2_exp.o
 
+DYNOBJ_LOADER_PROG = $(BUILDTOP)/kdc/krb5kdc
+DYNOBJ_EXPFLAGS_WITH_LOADER = -lgssrpc $(KDB5_DB_LIB)
+DYNOBJ_EXPDEPS_WITH_LOADER = $(GSSRPC_DEPLIBS)
+
 all-unix:: $(LIBBASE)$(SO_EXT)
 install-unix:: install-libs
 clean-unix:: clean-libs clean-libobjs