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

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index faeba02abf23876dd377f1b64818e69bfb6fee31..07541631812ae35927ef57d6ac0b2658c0867966 100644 (file)
--- 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 33b15c00b6f4ee121302f8f2887f7e8e16ab1d78..744998079ea0b91ba315ca43ac7c4b872dd02102 100644 (file)
--- 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 8a60058b0bbd8f405a492b9641f9678b377bc296..d28e6b91af5c25b76a8e5505612d63ea5d4d7fe6 100644 (file)
--- 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