From 0ec34da9df56efdd6963a0f3569fe24299a8ba0d Mon Sep 17 00:00:00 2001
From: Vladimir Nadvornik <nadvornik@suse.cz>
Date: Sat, 9 Apr 2011 19:27:43 +0200
Subject: [PATCH] fixed libjpeg in autoconf

---
 configure.in          | 3 ++-
 po/POTFILES.in        | 1 +
 src/image-load.c      | 2 ++
 src/image_load_jpeg.c | 4 ++++
 src/image_load_jpeg.h | 2 ++
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index b390258a..5cffbf58 100644
--- a/configure.in
+++ b/configure.in
@@ -301,7 +301,8 @@ AC_ARG_ENABLE([jpeg],
 if test "x${libjpeg}" != "xno"; then
   AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
       HAVE_JPEG=yes
-      JPEG_LIBS=-ljpeg,
+      JPEG_LIBS=-ljpeg
+      AC_DEFINE(HAVE_JPEG, 1, [define to enable use of custom jpeg loader]),
       HAVE_JPEG=no)
 else
   HAVE_JPEG=disabled
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 607a4be2..6863e10e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -46,6 +46,7 @@ src/history_list.c
 src/image.c
 src/image-load.c
 src/image-overlay.c
+src/image_load_jpeg.c
 src/img-view.c
 src/layout.c
 src/layout_config.c
diff --git a/src/image-load.c b/src/image-load.c
index c28df2e2..157756b6 100644
--- a/src/image-load.c
+++ b/src/image-load.c
@@ -513,12 +513,14 @@ static void image_loader_stop_loader(ImageLoader *il)
 static void image_loader_setup_loader(ImageLoader *il)
 {
 	g_mutex_lock(il->data_mutex);
+#ifdef HAVE_JPEG
 	if (il->bytes_total >= 2 && il->mapped_file[0] == 0xff && il->mapped_file[1] == 0xd8)
 		{
 		DEBUG_1("Using custom jpeg loader");
 		image_loader_backend_set_jpeg(&il->backend);
 		}
 	else
+#endif
 		image_loader_backend_set_default(&il->backend);
 
 	il->loader = il->backend.loader_new(image_loader_area_updated_cb, image_loader_size_cb, image_loader_area_prepared_cb, il);
diff --git a/src/image_load_jpeg.c b/src/image_load_jpeg.c
index dc79ddf0..484da8a9 100644
--- a/src/image_load_jpeg.c
+++ b/src/image_load_jpeg.c
@@ -39,10 +39,13 @@
 
 
 #include "main.h"
+
 #include "image-load.h"
 #include "image_load_jpeg.h"
 #include "jpeg_parser.h"
 
+#ifdef HAVE_JPEG
+
 #include <setjmp.h>
 #include <jpeglib.h>
 #include <jerror.h>
@@ -489,3 +492,4 @@ void image_loader_backend_set_jpeg(ImageLoaderBackend *funcs)
 
 
 
+#endif
\ No newline at end of file
diff --git a/src/image_load_jpeg.h b/src/image_load_jpeg.h
index d5e385a3..b8df45e1 100644
--- a/src/image_load_jpeg.h
+++ b/src/image_load_jpeg.h
@@ -13,7 +13,9 @@
 #ifndef IMAGE_LOAD_JPEG_H
 #define IMAGE_LOAD_JPEG_H
 
+#ifdef HAVE_JPEG
 void image_loader_backend_set_jpeg(ImageLoaderBackend *funcs);
+#endif
 
 #endif
 
-- 
2.20.1