From aa9ea72bfb7d40280ba6aa8d07da7121ff395f81 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf <Pascal.Stumpf@cubes.de>
Date: Sun, 12 Aug 2012 15:25:22 +0200
Subject: [PATCH] Do not use internal libjpeg.

Nowadays, OpenMotif is itself linked to libjpeg, so pulling in another
version of it causes symbol size mismatches, not to mention the maintenance
burden and security implications arising from keeping our own copy of libjpeg.

We still need some of the header files provided here because they are internal
to libjpeg and not installed on most distributions.
---
 cde/lib/DtHelp/Imakefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile
index eb219b54..3af280f5 100644
--- a/cde/lib/DtHelp/Imakefile
+++ b/cde/lib/DtHelp/Imakefile
@@ -13,8 +13,8 @@ XCOMM $XConsortium: Imakefile /main/25 1996/11/22 11:17:34 drk $
 #define IHaveSubdirs
 #define PassCDebugFlags	/**/
 
-SUBDIRS = il jpeg
-DONES = il/DONE jpeg/DONE
+SUBDIRS = il
+DONES = il/DONE
 EXTRALIBRARYDEPS = $(DONES)
 
 MakeSubdirs($(SUBDIRS))
@@ -149,7 +149,7 @@ JPEG_OBJS = \
         jpeg/jdinput.o      jpeg/jerror.o       jpeg/jutils.o
 
 SRCS = $(SRCS1) $(SRCS2) $(CVSRCS) $(LCXSRCS)
-OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS) $(JPEG_OBJS)
+OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS)
 
 #include <Library.tmpl>
 
-- 
2.25.1