From 44baf5431b17b68ac3f28bb4845ff9e56c855709 Mon Sep 17 00:00:00 2001
From: Peter Howkins <flibble@users.sourceforge.net>
Date: Mon, 12 Mar 2012 11:33:49 +0000
Subject: [PATCH] Link with C++ linker

---
 cde/programs/dthelp/dthelpdemo/Imakefile  | 6 ++++++
 cde/programs/dthelp/dthelpgen/Imakefile   | 6 ++++++
 cde/programs/dthelp/dthelpprint/Imakefile | 6 ++++++
 cde/programs/dthelp/dthelpview/Imakefile  | 6 ++++++
 4 files changed, 24 insertions(+)

diff --git a/cde/programs/dthelp/dthelpdemo/Imakefile b/cde/programs/dthelp/dthelpdemo/Imakefile
index d02c4954..8c6b85ac 100644
--- a/cde/programs/dthelp/dthelpdemo/Imakefile
+++ b/cde/programs/dthelp/dthelpdemo/Imakefile
@@ -17,6 +17,12 @@ DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB)
 LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
 SYS_LIBRARIES = DtClientSysLibs $(CXXLIB)
 
+XCOMM On Linux once you link against a C++ library the whole program
+XCOMM has to be linked with the C++ linker
+#if defined(LinuxDistribution)
+CCLINK = $(CXX)
+#endif
+
 SRCS = Main.c HourGlass.c HelpCache.c
 OBJS = Main.o HourGlass.o HelpCache.o
 
diff --git a/cde/programs/dthelp/dthelpgen/Imakefile b/cde/programs/dthelp/dthelpgen/Imakefile
index d6c06219..9bb1ca42 100644
--- a/cde/programs/dthelp/dthelpgen/Imakefile
+++ b/cde/programs/dthelp/dthelpgen/Imakefile
@@ -11,6 +11,12 @@ SYS_LIBRARIES = DtClientSysLibs $(CXXLIB)
 
 EXTRA_INCLUDES = -I$(DTHELPSRC)
 
+XCOMM On Linux once you link against a C++ library the whole program
+XCOMM has to be linked with the C++ linker
+#if defined(LinuxDistribution)
+CCLINK = $(CXX)
+#endif
+
 SRCS = helpgen.c version.c
 OBJS = helpgen.o version.o
 
diff --git a/cde/programs/dthelp/dthelpprint/Imakefile b/cde/programs/dthelp/dthelpprint/Imakefile
index 0db5ce16..a81a5450 100644
--- a/cde/programs/dthelp/dthelpprint/Imakefile
+++ b/cde/programs/dthelp/dthelpprint/Imakefile
@@ -16,6 +16,12 @@ SYS_LIBRARIES = DtClientSysLibs -lw $(CXXLIB)
 SYS_LIBRARIES = DtClientSysLibs $(CXXLIB)
 #endif
 
+XCOMM On Linux once you link against a C++ library the whole program
+XCOMM has to be linked with the C++ linker
+#if defined(LinuxDistribution)
+CCLINK = $(CXX)
+#endif
+
 SRCS = Main.c Initialize.c PrintUtil.c PrintTopics.c PrintManStrFile.c version.c
 OBJS = Main.o Initialize.o PrintUtil.o PrintTopics.o PrintManStrFile.o version.o
 
diff --git a/cde/programs/dthelp/dthelpview/Imakefile b/cde/programs/dthelp/dthelpview/Imakefile
index 1875a14d..df38f4ed 100644
--- a/cde/programs/dthelp/dthelpview/Imakefile
+++ b/cde/programs/dthelp/dthelpview/Imakefile
@@ -1,6 +1,12 @@
 XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:26:44 drk $
 PROGRAMS = dthelpview
 
+XCOMM On Linux once you link against a C++ library the whole program
+XCOMM has to be linked with the C++ linker
+#if defined(LinuxDistribution)
+CCLINK = $(CXX)
+#endif
+
 DEFINES = -D_BMS
 INCLUDES = -I. 
 
-- 
2.25.1