[tracker/tracker-0.16] tracker-extract: Make icon extractor optional, using --enable-icon

[Martyn James Russell <mr src gnome org>]

commit de8493b5a4f369c01b20ec85f66d078e4b4fecd8
Author: Jonatan Pålsson <jonatan palsson pelagicore com>
Date:   Tue Jul 9 10:43:19 2013 +0200

    tracker-extract: Make icon extractor optional, using --enable-icon

 configure.ac                    |   21 +++++++++++++++++++++
 src/tracker-extract/Makefile.am |   12 +++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 272e9ae..c787143 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2279,6 +2279,26 @@ fi
 AM_CONDITIONAL(HAVE_TEXT, test "x$have_text" = "xyes")
 
 ####################################################################
+# Check for tracker-extract: icon
+####################################################################
+
+AC_ARG_ENABLE(icon,
+              AS_HELP_STRING([--enable-icon],
+                             [enable icon support [[default=auto]]]),,
+              [enable_icon=auto])
+
+if test "x$enable_icon" != "xno"; then
+   AC_SUBST(ICON_CFLAGS)
+   AC_SUBST(ICON_LIBS)
+   AC_DEFINE(HAVE_ICON, [], [Define if we have ICON extractor])
+   have_icon=yes
+else
+   have_icon="no  (disabled)"
+fi
+
+AM_CONDITIONAL(HAVE_ICON, test "x$have_icon" = "xyes")
+
+####################################################################
 # Check for tracker-extract, tracker-writeback: totem-pl-parser
 ####################################################################
 
@@ -2559,6 +2579,7 @@ Metadata Extractors:
        Support MP3 parsing:                    $have_mp3
        Support PS parsing:                     $have_ps
        Support text parsing:                   $have_text
+       Support icon parsing:                   $have_icon
 
 Data Miners:
 
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 80e6142..daad169 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -53,11 +53,8 @@ rules_in_files = \
 # NOTE:
 # We don't always link with libtracker-common, we only link
 # against it if we directly use functions in the .so
-modules_LTLIBRARIES = \
-       libextract-icon.la
-
-rules_DATA = \
-       10-ico.rule
+modules_LTLIBRARIES = # Empty
+rules_DATA = # Empty
 
 if HAVE_LIBVORBIS
 modules_LTLIBRARIES += libextract-vorbis.la
@@ -174,6 +171,11 @@ modules_LTLIBRARIES += libextract-text.la
 rules_DATA += 90-text-generic.rule
 endif
 
+if HAVE_ICON
+modules_LTLIBRARIES += libextract-icon.la
+rules_DATA += 10-ico.rule
+endif
+
 # ABW
 libextract_abw_la_SOURCES = tracker-extract-abw.c
 libextract_abw_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)