[gthumb: 80/129] make jpeg_utils optional instead of mandatory.

[Paolo Bacchilega <paobac src gnome org>]

commit d0c376fe1fc502c2b7f541dc3bae34219b059615
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Mon Apr 25 15:25:40 2011 +0200

    make jpeg_utils optional instead of mandatory.

 extensions/cairo_io/cairo_io.extension.in.in       |    2 +-
 extensions/image_viewer/Makefile.am                |    3 +++
 .../image_viewer/image_viewer.extension.in.in      |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/extensions/cairo_io/cairo_io.extension.in.in b/extensions/cairo_io/cairo_io.extension.in.in
index c164ce2..1115df3 100644
--- a/extensions/cairo_io/cairo_io.extension.in.in
+++ b/extensions/cairo_io/cairo_io.extension.in.in
@@ -4,4 +4,4 @@ Hidden=true
 [Loader]
 Type=module
 File=%LIBRARY%
-Requires=jpeg_utils
+After=jpeg_utils
diff --git a/extensions/image_viewer/Makefile.am b/extensions/image_viewer/Makefile.am
index f52c614..05a6d56 100644
--- a/extensions/image_viewer/Makefile.am
+++ b/extensions/image_viewer/Makefile.am
@@ -17,6 +17,9 @@ libimage_viewer_la_SOURCES = 		\
 libimage_viewer_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libimage_viewer_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libimage_viewer_la_LIBADD = $(GTHUMB_LIBS)
+if ENABLE_JPEG_TOOLS
+libimage_viewer_la_LIBADD += ../jpeg_utils/libjpeg_utils.la
+endif
 libimage_viewer_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
 
 extensioninidir = $(extensiondir)
diff --git a/extensions/image_viewer/image_viewer.extension.in.in b/extensions/image_viewer/image_viewer.extension.in.in
index 2eaadb3..58fd417 100644
--- a/extensions/image_viewer/image_viewer.extension.in.in
+++ b/extensions/image_viewer/image_viewer.extension.in.in
@@ -8,6 +8,6 @@ Icon=image-x-generic
 Category=Viewer
 
 [Loader]
-After=file_viewer
+After=file_viewer;jpeg_utils
 Type=module
 File=%LIBRARY%