[gthumb] do not compile the extensions that require jpeg_utils if jpeg_tools is not enabled

[Paolo Bacchilega <paobac src gnome org>]

commit fa305b7f3abf7abcfa72af09ce485b69931e54ad
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Fri Apr 20 23:23:24 2012 +0200

    do not compile the extensions that require jpeg_utils if jpeg_tools is not enabled

 extensions/contact_sheet/Makefile.am  |    5 ++++-
 extensions/image_rotation/Makefile.am |    7 +++++--
 extensions/importer/Makefile.am       |    7 +++++--
 extensions/jpeg_utils/Makefile.am     |   15 +++++++--------
 extensions/photo_importer/Makefile.am |    5 ++++-
 extensions/pixbuf_savers/Makefile.am  |   14 +++++++++-----
 extensions/webalbums/Makefile.am      |    5 ++++-
 7 files changed, 38 insertions(+), 20 deletions(-)
---
diff --git a/extensions/contact_sheet/Makefile.am b/extensions/contact_sheet/Makefile.am
index 3cd002d..2a74fb5 100644
--- a/extensions/contact_sheet/Makefile.am
+++ b/extensions/contact_sheet/Makefile.am
@@ -60,7 +60,10 @@ endif
 
 libcontact_sheet_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb -DCONTACT_SHEET_DATADIR=\"$(contact_sheet_datadir)\"
 libcontact_sheet_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
-libcontact_sheet_la_LIBADD = $(GTHUMB_LIBS) ../image_rotation/libimage_rotation.la ../export_tools/libexport_tools.la
+libcontact_sheet_la_LIBADD = $(GTHUMB_LIBS) ../export_tools/libexport_tools.la
+if ENABLE_JPEG_TOOLS
+libcontact_sheet_la_LIBADD += ../image_rotation/libimage_rotation.la
+endif
 libcontact_sheet_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
 
 extensioninidir = $(extensiondir)
diff --git a/extensions/image_rotation/Makefile.am b/extensions/image_rotation/Makefile.am
index 767b9b8..f8b86dd 100644
--- a/extensions/image_rotation/Makefile.am
+++ b/extensions/image_rotation/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_JPEG_TOOLS
+
 extensiondir = $(pkglibdir)/extensions
 extension_LTLIBRARIES = libimage_rotation.la
 
@@ -23,12 +25,13 @@ libimage_rotation_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
 extensioninidir = $(extensiondir)
 extensionini_in_files = image_rotation.extension.in.in
 extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension)
+DISTCLEANFILES = $(extensionini_DATA)
+
+endif
 
 @GTHUMB_EXTENSION_IN_RULE@
 @GTHUMB_EXTENSION_RULE@
 
 EXTRA_DIST = $(extensionini_in_files) 
 
-DISTCLEANFILES = $(extensionini_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/extensions/importer/Makefile.am b/extensions/importer/Makefile.am
index 29e7f2c..d8dcfcd 100644
--- a/extensions/importer/Makefile.am
+++ b/extensions/importer/Makefile.am
@@ -45,9 +45,12 @@ libimporter_la_SOURCES = 			\
 	main.c					\
 	utils.c
 
-libimporter_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libimporter_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
 libimporter_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
-libimporter_la_LIBADD = $(GTHUMB_LIBS) ../catalogs/libcatalogs.la ../image_rotation/libimage_rotation.la
+libimporter_la_LIBADD = $(GTHUMB_LIBS) ../catalogs/libcatalogs.la
+if ENABLE_JPEG_TOOLS
+libimporter_la_LIBADD += ../image_rotation/libimage_rotation.la
+endif
 if ENABLE_EXIV2
 libimporter_la_LIBADD += ../exiv2_tools/libexiv2_tools.la
 endif
diff --git a/extensions/jpeg_utils/Makefile.am b/extensions/jpeg_utils/Makefile.am
index 349d720..9ef58d9 100644
--- a/extensions/jpeg_utils/Makefile.am
+++ b/extensions/jpeg_utils/Makefile.am
@@ -1,7 +1,8 @@
+if ENABLE_JPEG_TOOLS
+
 extensiondir = $(pkglibdir)/extensions
 extension_LTLIBRARIES = libjpeg_utils.la
 
-if ENABLE_JPEG_TOOLS
 libjpeg_utils_la_SOURCES = 		\
 	jmemorydest.c			\
 	jmemorydest.h			\
@@ -24,10 +25,6 @@ libjpeg_utils_la_SOURCES +=		\
 	transupp-62.c			\
 	transupp-62.h
 endif
-	
-else
-libjpeg_utils_la_SOURCES =
-endif
 
 libjpeg_utils_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libjpeg_utils_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
@@ -35,14 +32,16 @@ libjpeg_utils_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS)
 libjpeg_utils_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
 
 extensioninidir = $(extensiondir)
-extensionini_in_files = jpeg_utils.extension.in.in
 extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension)
+DISTCLEANFILES = $(extensionini_DATA)
+
+endif
+
+extensionini_in_files = jpeg_utils.extension.in.in
 
 @GTHUMB_EXTENSION_IN_RULE@
 @GTHUMB_EXTENSION_RULE@
 
 EXTRA_DIST = $(extensionini_in_files) README.6b README.8a
 
-DISTCLEANFILES = $(extensionini_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/extensions/photo_importer/Makefile.am b/extensions/photo_importer/Makefile.am
index 81c04e9..877adf4 100644
--- a/extensions/photo_importer/Makefile.am
+++ b/extensions/photo_importer/Makefile.am
@@ -15,7 +15,10 @@ libphoto_importer_la_SOURCES = 		\
 	
 libphoto_importer_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libphoto_importer_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
-libphoto_importer_la_LIBADD = $(GTHUMB_LIBS) ../catalogs/libcatalogs.la ../image_rotation/libimage_rotation.la ../importer/libimporter.la 
+libphoto_importer_la_LIBADD = $(GTHUMB_LIBS) ../catalogs/libcatalogs.la ../importer/libimporter.la
+if ENABLE_JPEG_TOOLS
+libphoto_importer_la_LIBADD += ../image_rotation/libimage_rotation.la
+endif 
 libphoto_importer_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
 
 extensioninidir = $(extensiondir)
diff --git a/extensions/pixbuf_savers/Makefile.am b/extensions/pixbuf_savers/Makefile.am
index bfe9f34..f2f7563 100644
--- a/extensions/pixbuf_savers/Makefile.am
+++ b/extensions/pixbuf_savers/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_JPEG_TOOLS
+
 SUBDIRS = data
 
 extensiondir = $(pkglibdir)/extensions
@@ -53,11 +55,6 @@ libpixbuf_savers_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
 extensioninidir = $(extensiondir)
 extensionini_in_files = pixbuf_savers.extension.in.in
 extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension)
-
- GTHUMB_EXTENSION_IN_RULE@
- GTHUMB_EXTENSION_RULE@
-
-EXTRA_DIST = $(extensionini_in_files) 
 DISTCLEANFILES = $(extensionini_DATA)
 BUILT_SOURCES = $(ENUM_TYPES)
 CLEANFILES = $(BUILT_SOURCES)
@@ -65,4 +62,11 @@ CLEANFILES = $(BUILT_SOURCES)
 dist-hook:
 	cd $(distdir); rm -f $(CLEANFILES)
 
+endif
+
+ GTHUMB_EXTENSION_IN_RULE@
+ GTHUMB_EXTENSION_RULE@
+
+EXTRA_DIST = $(extensionini_in_files) 
+
 -include $(top_srcdir)/git.mk
diff --git a/extensions/webalbums/Makefile.am b/extensions/webalbums/Makefile.am
index 55a8819..f49830c 100644
--- a/extensions/webalbums/Makefile.am
+++ b/extensions/webalbums/Makefile.am
@@ -34,7 +34,10 @@ endif
 
 libwebalbums_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb -DWEBALBUM_DATADIR=\"$(webalbum_datadir)\"
 libwebalbums_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
-libwebalbums_la_LIBADD = $(GTHUMB_LIBS) ../image_rotation/libimage_rotation.la ../export_tools/libexport_tools.la
+libwebalbums_la_LIBADD = $(GTHUMB_LIBS) ../export_tools/libexport_tools.la
+if ENABLE_JPEG_TOOLS
+libwebalbums_la_LIBADD += ../image_rotation/libimage_rotation.la
+endif 
 libwebalbums_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
 
 extensioninidir = $(extensiondir)