libtk-img (1:1.3-release-12) libjpeg.diff

Summary

 libjpeg/tcl/Makefile.in    |    3 +--
 libjpeg/tcl/jpegtclDecls.h |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

    
download this patch

Patch contents

Patch enable dynamic linking to system-wide libjpeg.

Index: libtk-img/libjpeg/tcl/Makefile.in
========================================================================
--- libtk-img.orig/libjpeg/tcl/Makefile.in
+++ libtk-img/libjpeg/tcl/Makefile.in
@@ -31,7 +31,6 @@
 		jpegtcl.c		\
 		jpegtclStubInit.c	\
 		jpegtclStubLib.c	\
-		$(jpeg_Sources)		\
 		@EXTRA_SOURCES@
 
 WIN_SOURCES	= 
@@ -199,7 +198,7 @@
 CONFIG_CLEAN_FILES = Makefile jpegtclConfig.sh pkgIndex.tcl libjpeg
 
 CPPFLAGS	= @CPPFLAGS@ -DPACKAGE_NAME=\"$(PACKAGE)\"
-LIBS		= @LIBS@
+LIBS		= @LIBS@ -ljpeg
 AR		= ar
 CFLAGS		= @CFLAGS@
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Index: libtk-img/libjpeg/tcl/jpegtclDecls.h
========================================================================
--- libtk-img.orig/libjpeg/tcl/jpegtclDecls.h
+++ libtk-img/libjpeg/tcl/jpegtclDecls.h
@@ -20,8 +20,8 @@
 #undef EXTERN
 
 #include <jpegtclDeclsMask.h>
-#include <../jpeglib.h>
-#include <../jerror.h>
+#include "/usr/include/jpeglib.h"
+#include "/usr/include/jerror.h"
 #include <jpegtclDeclsUnmask.h>
 
 /*