From bcc1ca537eb93522b19fe05d857a62c23086a4d5 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Thu, 21 Nov 2019 20:06:29 -0700
Subject: [PATCH] dtimsstart: make it build

---
 cde/configure.ac                    |  2 ++
 cde/programs/dtimsstart/Makefile.am | 28 ++++++++++++++--------------
 cde/programs/dtimsstart/env.c       |  2 ++
 cde/programs/dtimsstart/start.c     |  1 +
 cde/programs/dtimsstart/util.c      |  3 ++-
 cde/programs/dtimsstart/win.c       |  1 +
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/cde/configure.ac b/cde/configure.ac
index 9aa02779..9a41ee47 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -453,6 +453,8 @@ programs/fontaliases/freebsd/C/Makefile
 
 programs/dtdspmsg/Makefile
 
+programs/dtimsstart/Makefile
+
 ])
 
 AC_OUTPUT
diff --git a/cde/programs/dtimsstart/Makefile.am b/cde/programs/dtimsstart/Makefile.am
index 9479c8ad..d8dbc7bb 100644
--- a/cde/programs/dtimsstart/Makefile.am
+++ b/cde/programs/dtimsstart/Makefile.am
@@ -6,26 +6,26 @@ bin_PROGRAMS = dtimsstart
 
 dist_xsession_SCRIPTS = 0020.dtims
 
-0020.dtims_CPPFLAGS = -P
+dtimsstart_CFLAGS = -DNLS 
 
-dtimsstart_CFLAGS = -DNLS -I../../lib
-
-dtimsstart_LDADD = $(LIBHELP) $(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS}
+dtimsstart_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
 
 if SOLARIS
 dtimsstart_CFLAGS += -xF
 endif
 
-if AIX
-dtimsstart_CFLAGS += -DANSICPP
-endif
+dtimsstart_SOURCES = action.c env.c file.c main.c remote.c select.c	\
+		     start.c util.c win.c ximserr.h ximsfunc.h xims.h	\
+		     ximspath.h
+
+BUILT_SOURCES = 0020.dtims
+CLEANFILE = $(BUILT_SOURCES)
 
-all: 0020.dtims
+LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
+                    -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
+		    -DKORNSHELL=$(KSH)
 
-dtimsstart_SOURCES = action.c        env.c           file.c \
-		     main.c          remote.c        select.c \
-		     start.c         util.c
+0020.dtims: 0020.dtims.src
+	$(RM) $@
+	$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
 
-CPPSRC = 0020.dtims.src
-CPPTARGET = 0020.dtims
-include $(srcdir)/include/cppfile.tmpl
diff --git a/cde/programs/dtimsstart/env.c b/cde/programs/dtimsstart/env.c
index 669623c4..c7358c27 100644
--- a/cde/programs/dtimsstart/env.c
+++ b/cde/programs/dtimsstart/env.c
@@ -26,6 +26,8 @@
 #include "xims.h"
 
 
+int find_CDE_locale_name(void); /* from util.c */
+
 typedef	enum {
     P_Shell,	/* posix shell */
     K_Shell,	/* Korn shell */
diff --git a/cde/programs/dtimsstart/start.c b/cde/programs/dtimsstart/start.c
index 78fc2a38..db757395 100644
--- a/cde/programs/dtimsstart/start.c
+++ b/cde/programs/dtimsstart/start.c
@@ -27,6 +27,7 @@
 #include	<sys/wait.h>
 #include	<setjmp.h>
 #include	<unistd.h>
+#include	<time.h>
 
 #if (defined(__linux__) || defined(CSRG_BASED)) && !defined(_NFILE)
 #define _NFILE FOPEN_MAX
diff --git a/cde/programs/dtimsstart/util.c b/cde/programs/dtimsstart/util.c
index 9437e366..e359c319 100644
--- a/cde/programs/dtimsstart/util.c
+++ b/cde/programs/dtimsstart/util.c
@@ -23,7 +23,8 @@
 /* @(#)$XConsortium: util.c /main/6 1996/07/12 15:44:21 pascale $ */
 
 #include <time.h>
-#include <DtHelp/LocaleXlate.h>  /* for locale equivalence between platforms */
+#include <ctype.h>
+#include <Dt/LocaleXlate.h>  /* for locale equivalence between platforms */
 #include "xims.h"
 #include <sys/stat.h>
 
diff --git a/cde/programs/dtimsstart/win.c b/cde/programs/dtimsstart/win.c
index 547c1f9f..38fa7a17 100644
--- a/cde/programs/dtimsstart/win.c
+++ b/cde/programs/dtimsstart/win.c
@@ -23,6 +23,7 @@
 /* @(#)$TOG: win.c /main/9 1997/06/18 17:33:01 samborn $ */
 
 #include	<stdint.h>
+#include	<time.h>
 
 #include	<X11/X.h>
 #include	<X11/Xlib.h>
-- 
2.25.1