From fa3ad160e49b599a3ee34c23498feab764898355 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Sun, 12 Aug 2012 17:31:28 -0600
Subject: [PATCH] Fix broken linux builds caused by recent DtHelp/Imakefile
 jpeg change

A patch from Pascal Stumpf using external jpeg broke linux builds,
since libjpeg needs to be linked in when using a remote jpeg lib.

So, in lnxLib.tmpl, define SharedDtHelpReqs so -ljpeg is used.  Also,
in DtHelp/Imakefile, use proper Arch defines so external jpeg libs are
only used on linux, fbsd, and obsd systems.
---
 cde/config/cf/lnxLib.tmpl |  3 +++
 cde/lib/DtHelp/Imakefile  | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/cde/config/cf/lnxLib.tmpl b/cde/config/cf/lnxLib.tmpl
index e44d87d80..1e4a24162 100644
--- a/cde/config/cf/lnxLib.tmpl
+++ b/cde/config/cf/lnxLib.tmpl
@@ -42,3 +42,6 @@ XMULIB = -lXmu $(XLIB)
 # define SharedCsaReqs -lXt
 #endif
 
+#ifndef SharedDtHelpReqs
+# define SharedDtHelpReqs -ljpeg
+#endif
diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile
index 3af280f55..3c2bcfe0a 100644
--- a/cde/lib/DtHelp/Imakefile
+++ b/cde/lib/DtHelp/Imakefile
@@ -13,8 +13,14 @@ XCOMM $XConsortium: Imakefile /main/25 1996/11/22 11:17:34 drk $
 #define IHaveSubdirs
 #define PassCDebugFlags	/**/
 
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
 SUBDIRS = il
 DONES = il/DONE
+#else
+SUBDIRS = il jpeg
+DONES = il/DONE jpeg/DONE
+#endif
+
 EXTRALIBRARYDEPS = $(DONES)
 
 MakeSubdirs($(SUBDIRS))
@@ -149,7 +155,11 @@ JPEG_OBJS = \
         jpeg/jdinput.o      jpeg/jerror.o       jpeg/jutils.o
 
 SRCS = $(SRCS1) $(SRCS2) $(CVSRCS) $(LCXSRCS)
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
 OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS)
+#else
+OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS) $(JPEG_OBJS)
+#endif
 
 #include <Library.tmpl>