[gthumb: 75/129] don't compile jpeg loader if libjpeg is not available
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb: 75/129] don't compile jpeg loader if libjpeg is not available
- Date: Wed, 27 Apr 2011 20:56:41 +0000 (UTC)
commit b8b7233076c80e191fa6e487410c61d9b5fb20d9
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sun Apr 24 17:29:11 2011 +0200
don't compile jpeg loader if libjpeg is not available
extensions/cairo_io/Makefile.am | 16 ++++++++++++----
extensions/cairo_io/main.c | 2 ++
2 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/extensions/cairo_io/Makefile.am b/extensions/cairo_io/Makefile.am
index ee2dfb2..283897b 100644
--- a/extensions/cairo_io/Makefile.am
+++ b/extensions/cairo_io/Makefile.am
@@ -2,13 +2,21 @@ extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libcairo_io.la
libcairo_io_la_SOURCES = \
- cairo-io-jpeg.c \
- cairo-io-jpeg.h \
main.c
-libcairo_io_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
+if ENABLE_JPEG_TOOLS
+libcairo_io_la_SOURCES += \
+ cairo-io-jpeg.c \
+ cairo-io-jpeg.h
+endif
+
+libcairo_io_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libcairo_io_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
-libcairo_io_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) ../jpeg_utils/libjpeg_utils.la
+libcairo_io_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS)
+if ENABLE_JPEG_TOOLS
+libcairo_io_la_LIBADD += ../jpeg_utils/libjpeg_utils.la
+endif
+
libcairo_io_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
extensioninidir = $(extensiondir)
diff --git a/extensions/cairo_io/main.c b/extensions/cairo_io/main.c
index 94abcaf..7f74c92 100644
--- a/extensions/cairo_io/main.c
+++ b/extensions/cairo_io/main.c
@@ -28,10 +28,12 @@
G_MODULE_EXPORT void
gthumb_extension_activate (void)
{
+#ifdef HAVE_LIBJPEG
gth_main_register_image_loader_func (_cairo_image_surface_create_from_jpeg,
GTH_IMAGE_FORMAT_CAIRO_SURFACE,
"image/jpeg",
NULL);
+#endif
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]