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.

diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile
index eb219b5475e30c0f5ca694e1dba0c33493ed75d8..3af280f5547a94bf846d9e4429d4bb194f1ccfff 100644 (file)
--- 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>