This code can be removed once all systems have the correct system library
linked, I need someone to help me find them,as I don't have any bsd, solaris,
aix or hpux systems.
Thank you for your time,
-Chase
From 9e1d01c6a217af66885e860d3eaa0ff5b5724538 Mon Sep 17 00:00:00 2001
From: chase <ch...@localhost.com>
Date: Sun, 26 Aug 2018 09:38:50 -0500
Subject: [PATCH 2/2] Disable building tcl on linux systems
This commit replaces our custom version of TCL with the systems's library on
Linux systems. This means that Linux systems will now require the tcl-dev
package in order to build dtdocbook.
---
cde/programs/dtdocbook/Imakefile | 6 +++++-
cde/programs/dtdocbook/instant/Imakefile | 6 ++++++
cde/programs/dtdocbook/instant/general.h | 4 ++++
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/cde/programs/dtdocbook/Imakefile b/cde/programs/dtdocbook/Imakefile
index cb689084..cf388d4a 100644
--- a/cde/programs/dtdocbook/Imakefile
+++ b/cde/programs/dtdocbook/Imakefile
@@ -3,7 +3,11 @@ XCOMM $XConsortium: Imakefile /main/6 1996/10/24 00:10:08 cde-hp $
#define IHaveSubdirs
#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-SUBDIRS = doc2sdl lib tcl instant xlate_locale
+#if !defined(__linux__)
+TCL=tcl
+#endif
+
+SUBDIRS = doc2sdl lib $(TCL) instant xlate_locale
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
diff --git a/cde/programs/dtdocbook/instant/Imakefile b/cde/programs/dtdocbook/instant/Imakefile
index 9330fd4d..ce6790ca 100644
--- a/cde/programs/dtdocbook/instant/Imakefile
+++ b/cde/programs/dtdocbook/instant/Imakefile
@@ -4,8 +4,14 @@ XLATESRC = $(DTSVCSRC)/DtUtil2
INCLUDES = -I../lib/tptregexp -I../tcl -I$(XLATESRC)
DEPLIBS = $(DEPDTSVCLIB)
+#if defined(__linux__)
+DEFINES = -DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT
+LOCAL_LIBRARIES = /usr/lib/x86_64-linux/gnu/libtcl.a $(DTSVCLIB) $(TTLIB) \
+$(XMLIB) $(XTOOLLIB) $(XLIB) -L../lib/tptregexp -ltptregexp
+#else
LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) \
-L../lib/tptregexp -ltptregexp ../tcl/libtcl.a
+#endif
#if defined(SunArchitecture)
EXTRA_LIBRARIES = -lsocket -lnsl -lgen -lm
#else
diff --git a/cde/programs/dtdocbook/instant/general.h b/cde/programs/dtdocbook/instant/general.h
index c2f360e8..94f4c7e0 100644
--- a/cde/programs/dtdocbook/instant/general.h
+++ b/cde/programs/dtdocbook/instant/general.h
@@ -53,7 +53,11 @@ static char *gen_h_RCSid =
#endif
/* get Tcl header so the variables make sense */
+#if defined(__linux__)
+#include <tcl/tcl.h>
+#else
#include <tcl.h>
+#endif
/* instant variable delimiter (can't use '$', collides with Tcl) */
#define VDELIM '@'
--
2.17.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
