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.

diff --git a/cde/config/cf/lnxLib.tmpl b/cde/config/cf/lnxLib.tmpl
index e44d87d8045222019829405689d873b7b046911e..1e4a24162fe618b54be9f92e34d7335fd126c277 100644 (file)
--- 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 3af280f5547a94bf846d9e4429d4bb194f1ccfff..3c2bcfe0a2458681848052d48fb06bae1fc9e094 100644 (file)
--- 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>