From 8f4c5da8971926f7eccc912f7998c343aef3c33b Mon Sep 17 00:00:00 2001
From: Shantonu Sen <ssen@mit.edu>
Date: Fri, 8 Sep 2000 00:34:08 +0000
Subject: [PATCH] Updated #include's to point to new location of mts.h on
 mts/generic

---
 sbr/addrsbr.c    |    2 +-
 sbr/m_getfld.c   |    2 +-
 uip/Makefile.in  |    4 ++--
 uip/ali.c        |    2 +-
 uip/ap.c         |    2 +-
 uip/conflict.c   |    2 +-
 uip/dropsbr.c    |    2 +-
 uip/inc.c        |    2 +-
 uip/mhbuild.c    |    2 +-
 uip/mhbuildsbr.c |    2 +-
 uip/mhcachesbr.c |    2 +-
 uip/mhlist.c     |    2 +-
 uip/mhlistsbr.c  |    2 +-
 uip/mhn.c        |    2 +-
 uip/mhoutsbr.c   |    2 +-
 uip/mhparse.c    |    2 +-
 uip/mhshow.c     |    2 +-
 uip/mhshowsbr.c  |    2 +-
 uip/mhstore.c    |    2 +-
 uip/mhstoresbr.c |    2 +-
 uip/mhtest.c     |    2 +-
 uip/msgchk.c     |    2 +-
 uip/msh.c        |    2 +-
 uip/mshcmds.c    |    2 +-
 uip/popi.c       |    4 ++--
 uip/post.c       |    2 +-
 uip/rcvdist.c    |    2 +-
 uip/rcvpack.c    |    2 +-
 uip/rcvstore.c   |    2 +-
 uip/rcvtty.c     |    2 +-
 uip/scan.c       |    2 +-
 uip/slocal.c     |    2 +-
 uip/spost.c      |    2 +-
 uip/viamail.c    |    2 +-
 34 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index a1cdf8c..545d397 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -11,7 +11,7 @@
 
 /* High level parsing of addresses:
 
-   The routines in zotnet/mf/mf.c parse the syntactic representations of
+   The routines in sbr/mf.c parse the syntactic representations of
    addresses.  The routines in sbr/addrsbr.c associate semantics with those
    addresses.  
 
diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index a667be8..f62d0e8 100644
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -6,7 +6,7 @@
  */
 
 #include <h/mh.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 /* This module has a long and checkered history.  First, it didn't burst
    maildrops correctly because it considered two CTRL-A:s in a row to be
diff --git a/uip/Makefile.in b/uip/Makefile.in
index ff9fa56..972caf9 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -25,11 +25,11 @@ INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) $(HESIOD_INCLUDES) $(SASL_INCLUDES)
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
-MTSLIB   = ../mts/smtp/libsmtp.a
+MTSLIB   = ../mts/libmts.a
 KRB4_LIBS = @KRB4_LIBS@
 SASL_LIBS = @SASL_LIBS@
 HESIOD_LIBS = @HESIOD_LIBS@
-LOCALLIBS = ../config/version.o ../config/config.o $(MTSLIB) ../sbr/libmh.a ../zotnet/libzot.a
+LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a $(MTSLIB) 
 LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(SASL_LIBS) $(HESIOD_LIBS) $(LIBS)
 
 LINT	= @LINT@
diff --git a/uip/ali.c b/uip/ali.c
index 5b38b83..67e7aee 100644
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/aliasbr.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 /*
  * maximum number of names
diff --git a/uip/ap.c b/uip/ap.c
index dde1175..5184baf 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 #define	NADDRS	100
 
diff --git a/uip/conflict.c b/uip/conflict.c
index cac0ea8..c0ba63b 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/aliasbr.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <grp.h>
 #include <pwd.h>
 
diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 5cf4ee3..3c5fdd5 100644
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -10,7 +10,7 @@
 #ifndef	MMDFONLY
 # include <h/mh.h>
 # include <h/dropsbr.h>
-# include <zotnet/mts/mts.h>
+# include <mts/generic/mts.h>
 # include <h/tws.h>
 #else
 # include "dropsbr.h"
diff --git a/uip/inc.c b/uip/inc.c
index e6adb32..3ea3b9e 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -40,7 +40,7 @@
 #include <h/scansbr.h>
 #include <h/signals.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <errno.h>
 #include <signal.h>
 
diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 045146b..63204a5 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 227f111..4a6a986 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -19,7 +19,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 4f1f9d7..0be30c0 100644
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
diff --git a/uip/mhlist.c b/uip/mhlist.c
index 3960b1c..57b18b2 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index ae5463c..42e0b05 100644
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -11,7 +11,7 @@
 #include <h/signals.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
diff --git a/uip/mhn.c b/uip/mhn.c
index adb06da..11c0276 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index c2e0805..f292ddc 100644
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -12,7 +12,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
diff --git a/uip/mhparse.c b/uip/mhparse.c
index 0813aa7..8f4d574 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
diff --git a/uip/mhshow.c b/uip/mhshow.c
index a50292e..74a8f54 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index eb69100..83616a2 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
diff --git a/uip/mhstore.c b/uip/mhstore.c
index 14d7cde..b56a505 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index b2a3e31..f1b0162 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
diff --git a/uip/mhtest.c b/uip/mhtest.c
index 9a73bbf..90f7337 100644
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
diff --git a/uip/msgchk.c b/uip/msgchk.c
index 52aedc8..9489ef0 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -6,7 +6,7 @@
  */
 
 #include <h/mh.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <pwd.h>
 
diff --git a/uip/msh.c b/uip/msh.c
index 6bb6f06..0db7905 100644
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -17,7 +17,7 @@
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 #ifdef HAVE_TERMIOS_H
 # include <termios.h>
diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index c199502..b8c7d92 100644
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -11,7 +11,7 @@
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
diff --git a/uip/popi.c b/uip/popi.c
index cb24930..2fae381 100644
--- a/uip/popi.c
+++ b/uip/popi.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <errno.h>
 
 #ifndef	RPOP
@@ -515,7 +515,7 @@ msh (void)
 
 
 #ifdef SMTPMTS
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <mts/smtp/smtp.h>
 
 static int
diff --git a/uip/post.c b/uip/post.c
index ef13279..d91e003 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -14,7 +14,7 @@
 #include <h/mime.h>
 
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 #include <errno.h>
 #include <setjmp.h>
diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 1c70d74..9eb9916 100644
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -9,7 +9,7 @@
 #include <h/fmt_scan.h>
 #include <h/rcvmail.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 static struct swit switches[] = {
 #define	FORMSW       0
diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index f120afd..a760177 100644
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -9,7 +9,7 @@
 #include <h/dropsbr.h>
 #include <h/rcvmail.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 static struct swit switches[] = {
 #define MBOXSW       0
diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index bef959c..8734ebc 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -10,7 +10,7 @@
 #include <h/signals.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 static struct swit switches[] = {
 #define CRETSW         0
diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index d769b40..32d78d2 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -15,7 +15,7 @@
 #include <h/rcvmail.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <signal.h>
 #include <fcntl.h>
 
diff --git a/uip/scan.c b/uip/scan.c
index 77bc999..d85d80e 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -9,7 +9,7 @@
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <errno.h>
 
 /*
diff --git a/uip/slocal.c b/uip/slocal.c
index d50330d..8a3f5f7 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -27,7 +27,7 @@
 #include <h/rcvmail.h>
 #include <h/signals.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 #include <pwd.h>
 #include <signal.h>
diff --git a/uip/spost.c b/uip/spost.c
index 555bb68..18d1152 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -14,7 +14,7 @@
 #include <h/aliasbr.h>
 #include <h/dropsbr.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 #define	uptolow(c)	((isalpha(c) && isupper (c)) ? tolower (c) : c)
 
diff --git a/uip/viamail.c b/uip/viamail.c
index 8e3332d..2168f71 100644
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
-- 
1.7.10.4