diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2005-10-27 09:38:05 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2005-10-27 09:38:05 +0000 |
| commit | 634eb1518febc5bd54da0f6fedbf88153a5c8ff3 (patch) | |
| tree | d8a2f648a6dd8abf3596f1d6646b7f4f9d2a9032 /src/config | |
| parent | a75de46d12b94042ef1793d7a96902894336d328 (diff) | |
| download | krb5-634eb1518febc5bd54da0f6fedbf88153a5c8ff3.tar.gz krb5-634eb1518febc5bd54da0f6fedbf88153a5c8ff3.tar.xz krb5-634eb1518febc5bd54da0f6fedbf88153a5c8ff3.zip | |
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
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/ChangeLog | 5 | ||||
| -rw-r--r-- | src/config/libnover.in | 2 | ||||
| -rw-r--r-- | src/config/shlib.conf | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 43609e070..7471e1fbd 100644 --- 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 79b8e9f8f..3896e8462 100644 --- 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 6ebbbf684..cc42c75be 100644 --- 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)' |