When Shantonu made the new libmts.a, he swapped $(MTSLIB) and libmh.a in

sbr/Makefile.in so that libmh.a comes first, but this causes the build to fail
on Solaris, because libmts.a has to get ruserpass() out of libmh.a.  Swapping
them back to the way Ken Hornstein's patch (which I applied on Jul 20) put them,
with libmh.a correctly coming second.  If there are times when libmts.a needs to
come second, then it would appear there's a circular dependency and someone
(Shantonu?) did an mts merge incorrectly.

diff --git a/ChangeLog b/ChangeLog
index afb9c1d4ad50f5c3daf4003f9779a9411e161ea9..089dfc7dd3561cb3f9254b36b6b6177c6d34a6cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon Dec 11 22:08:07 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
+
+       * When Shantonu made the new libmts.a, he swapped $(MTSLIB) and
+       libmh.a in sbr/Makefile.in so that libmh.a comes first, but this
+       causes the build to fail on Solaris, because libmts.a has to get
+       ruserpass() out of libmh.a.  Swapping them back to the way Ken
+       Hornstein's patch (which I applied on Jul 20) put them, with
+       libmh.a correctly coming second.  If there are times when libmts.a
+       needs to come second, then it would appear there's a circular
+       dependency and someone (Shantonu?) did an mts merge incorrectly.
+
 Fri Sep 8 01:36:23 2000 Shantonu Sen <ssen@mit.edu>
 
        * Took out bad time textual time zones like BST and JST.

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 972caf94080455a70bcbe34e339c18c34406b4ca..8f9369906397f90702c89d3faa713f94e88b4de9 100644 (file)
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -29,7 +29,7 @@ MTSLIB   = ../mts/libmts.a
 KRB4_LIBS = @KRB4_LIBS@
 SASL_LIBS = @SASL_LIBS@
 HESIOD_LIBS = @HESIOD_LIBS@
-LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a $(MTSLIB) 
+LOCALLIBS = ../config/version.o ../config/config.o $(MTSLIB) ../sbr/libmh.a
 LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(SASL_LIBS) $(HESIOD_LIBS) $(LIBS)
 
 LINT   = @LINT@