diff options
| author | Tom Yu <tlyu@mit.edu> | 2003-06-11 21:19:43 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2003-06-11 21:19:43 +0000 |
| commit | dc5a862fb91bc85fa3e3634ff92c09b712b13420 (patch) | |
| tree | b493ad84fb4901bb9aff4ee790cc86159472bf7e /src | |
| parent | acd06d06713d8b37480631a5d6584bd52814eaf8 (diff) | |
| download | krb5-dc5a862fb91bc85fa3e3634ff92c09b712b13420.tar.gz krb5-dc5a862fb91bc85fa3e3634ff92c09b712b13420.tar.xz krb5-dc5a862fb91bc85fa3e3634ff92c09b712b13420.zip | |
Darwin libkrb4/err_txt.o needs dependency on krb_err.c
* Makefile.in (KRB_ERR_C): New variable; Darwin needs err_txt.o to
have a dependency on krb_err.c so that krb_err.c will be generated
first.
* configure.in: Set KRB_ERR_C to krb_err.c on Darwin.
ticket: new
target_version: 1.3
tags: pullup
component: krb5-build
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15610 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb4/ChangeLog | 8 | ||||
| -rw-r--r-- | src/lib/krb4/Makefile.in | 6 | ||||
| -rw-r--r-- | src/lib/krb4/configure.in | 3 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index faeba02abf..0754163181 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,11 @@ +2003-06-11 Tom Yu <tlyu@mit.edu> + + * Makefile.in (KRB_ERR_C): New variable; Darwin needs err_txt.o to + have a dependency on krb_err.c so that krb_err.c will be generated + first. + + * configure.in: Set KRB_ERR_C to krb_err.c on Darwin. + 2003-06-09 Ken Raeburn <raeburn@mit.edu> * RealmsConfig-glue.c (krb_get_krbhst): Don't fall back to DNS if diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in index 33b15c00b6..744998079e 100644 --- a/src/lib/krb4/Makefile.in +++ b/src/lib/krb4/Makefile.in @@ -32,6 +32,10 @@ EHDRDIR=$(BUILDTOP)$(S)include$(S)kerberosIV KRB_ERR=@KRB_ERR@ ##DOS##KRB_ERR=$(OUTPRE)krb_err.$(OBJEXT) +# Name of generated krb_err.c, needed for err_txt.* dependency on Darwin. +KRB_ERR_C=@KRB_ERR_C@ +##DOS##KRB_ERR_C= + OBJS = \ $(OUTPRE)change_password.$(OBJEXT) \ $(OUTPRE)cr_auth_repl.$(OBJEXT) \ @@ -219,7 +223,7 @@ krb_err_txt.c: krb_err.et $(srcdir)$(S)et_errtxt.awk # Will be empty on Darwin, krb_err_txt.c elsewhere. KRB_ERR_TXT=@KRB_ERR_TXT@ ##DOS##KRB_ERR_TXT=krb_err_txt.c -err_txt.so err_txt.po $(OUTPRE)err_txt.$(OBJEXT): err_txt.c $(KRB_ERR_TXT) +err_txt.so err_txt.po $(OUTPRE)err_txt.$(OBJEXT): err_txt.c $(KRB_ERR_C) $(KRB_ERR_TXT) depend-dependencies: krb_err.h $(EHDRDIR)$(S)krb_err.h \ kadm_err.h $(EHDRDIR)$(S)kadm_err.h \ diff --git a/src/lib/krb4/configure.in b/src/lib/krb4/configure.in index 8a60058b0b..d28e6b91af 100644 --- a/src/lib/krb4/configure.in +++ b/src/lib/krb4/configure.in @@ -6,14 +6,17 @@ case $krb5_cv_host in powerpc-apple-darwin*) KRB_ERR_TXT= KRB_ERR= + KRB_ERR_C=krb_err.c ;; *) KRB_ERR='$(OUTPRE)krb_err.$(OBJEXT)' KRB_ERR_TXT=krb_err_txt.c + KRB_ERR_C= ;; esac AC_SUBST([KRB_ERR_TXT]) AC_SUBST([KRB_ERR]) +AC_SUBST([KRB_ERR_C]) AC_PROG_AWK KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY_WITH_DEPS |