dtmail: Make it build. There is more work to be done here.

Specifically, we should be able to have libDtMail subdir build all of
it's objects directly w/o intervening Makefile.am's and archive .a
libs.

cde/programs/dtmail/dtmail/DmxMessage.C

@@ -72,7 +72,7 @@
 
 #include "Dmx.h"
 // For CHARSET
-#include <LocaleXlate.h>
+#include <Dt/LocaleXlate.h>
 #include <locale.h>
 #include <strings.h>
 

cde/programs/dtmail/dtmail/Makefile.am

@@ -7,7 +7,8 @@ dtmail_CXXFLAGS = -I../include -I../include/MotifApp -I../include/utils \
 		  $(TIRPCINC) -I$(srcdir)/lib -I../../dthelp -DRELEASE_NOTES \
 		  -DDTMAIL_TOOLTALK -DDTEDITOR
 
-dtmail_LDADD = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a
+dtmail_LDADD = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a -lXm \
+		@DTCLIENTLIBS@ $(XTOOLLIB) $(TIRPCLIB)
 
 # FIXME solaris....
 #if SOLARIS

cde/programs/dtmail/dtmailpr/Makefile.am

@@ -5,8 +5,8 @@ bin_PROGRAMS = dtmailpr
 dtmailpr_CXXFLAGS = -I../include -I../../dtcompat -I../../../. \
 		    -I$(srcdir)/lib $(TIRPCINC)
 
-dtmailpr_LDADD = ../libDtMail/libDtMail.a $(LIBPRINT) $(LIBHELP) $(LIBWIDGET) \
-		 $(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS}
+dtmailpr_LDADD = ../libDtMail/libDtMail.a @DTCLIENTLIBS@ \
+		 -lXm @LIBXIN@ -lXinerama $(XTOOLLIB) ${X_LIBS} $(TIRPCLIB)
 
 if FREEBSD
 dtmailpr_LDADD += -liconv

cde/programs/dtmail/dtmailpr/message.C

@@ -49,7 +49,7 @@
 
 #include "dmx.hh"
 // For CHARSET
-#include <DtHelp/LocaleXlate.h>
+#include <Dt/LocaleXlate.h>
 #include <locale.h>
 #include <strings.h>
 #include "utils/str_utils.h"

cde/programs/dtmail/libDtMail/Common/Makefile.am

@@ -3,14 +3,10 @@ MAINTAINERCLEANFILES = Makefile.in
 noinst_LIBRARIES = libCommon.a
 
 libCommon_a_CXXFLAGS = -I../../include -I../../include/utils -I$(srcdir)/lib \
-		       $(TIRPCINC) -DDL_NOT_DYNAMIC
+		       $(TIRPCINC) -DDL_NOT_DYNAMIC -DUSE_SOCKSTREAM
 
 if SOLARIS
 libCommon_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2
-# FIXME - i386 is NOT big endian...
-#if I386
-#libCommon_a_CXXFLAGS += -DBIG_ENDIAN
-#endif
 endif
 
 libCommon_a_SOURCES = APOPServer.C \
@@ -35,7 +31,7 @@ libCommon_a_SOURCES = APOPServer.C \
 		      IO.C \
 		      LanguagePortability.C \
 		      ObjectKey.C \
-		      NotDynamic.C
+		      NotDynamic.C \
 		      POP2Server.C \
 		      POP3Server.C \
 		      Process.C \

cde/programs/dtmail/libDtMail/Common/Session.C

@@ -69,7 +69,7 @@
 //-------------------------------------
 #include <locale.h>
 #include <time.h>
-#include <DtHelp/LocaleXlate.h>
+#include <Dt/LocaleXlate.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <limits.h>

cde/programs/dtmail/libDtMail/Makefile.am

@@ -6,4 +6,6 @@ noinst_LIBRARIES = libDtMail.a
 
 libDtMail_a_SOURCES =
 
-libDtMail_a_LIBADD = Common/libCommon.a RFC/libRFC.a
+# Unfortunately, this does not work -
+# libDtMail_a_LIBADD = Common/libCommon.a RFC/libRFC.a
+libDtMail_a_LIBADD = Common/*.o RFC/*.o

cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C

@@ -57,7 +57,7 @@
 
 // For CHARSET
 #include <locale.h>
-#include <DtHelp/LocaleXlate.h>
+#include <Dt/LocaleXlate.h>
 #include "str_utils.h"
 
 MIMEBodyPart::MIMEBodyPart(DtMailEnv & error,

cde/programs/dtmail/libDtMail/RFC/Makefile.am

@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
 noinst_LIBRARIES = libRFC.a
 
 libRFC_a_CXXFLAGS = -I../Common -I../../include -I../../include/utils \
-		    -I$(srcdir)/lib $(TIRPCINC) -DTTLOCK_OFF
+		    $(TIRPCINC) -DTTLOCK_OFF
 
 if SOLARIS
 libRFC_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2

cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C

@@ -64,7 +64,7 @@
 //-------------------------------------
 #include <locale.h>
 #include <time.h>
-#include <DtHelp/LocaleXlate.h>
+#include <Dt/LocaleXlate.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <limits.h>

cde/programs/dtmail/libDtMail/RFC/V3BodyPart.C

@@ -58,7 +58,7 @@
 
 // For CHARSET
 #include <locale.h>
-#include <DtHelp/LocaleXlate.h>
+#include <Dt/LocaleXlate.h>
 
 V3BodyPart::V3BodyPart(DtMailEnv & error,
 		       DtMail::Message * parent,