[tracker/configure-for-binaries: 67/77] tracker-extract: Merge QT/GdkPixbuf/LSA into CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit 3bcab0830bd6392cc7b454a9387ac06ec8f1ee7d
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Oct 26 10:48:27 2010 +0100

    tracker-extract: Merge QT/GdkPixbuf/LSA into CFLAGS/LIBS

 configure.ac                    |   21 +++++++++++----------
 src/tracker-extract/Makefile.am |    9 ---------
 2 files changed, 11 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e77b978..2232bff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -569,7 +569,7 @@ AM_CONDITIONAL(HAVE_TAGLIB, test "x$have_taglib" = "xyes")
 
 AC_ARG_ENABLE(libstreamanalyzer,
               AS_HELP_STRING([--enable-libstreamanalyzer],
-                             [enable libstreamananalyzer [[default=no]]]), ,
+                             [enable libstreamananalyzer [[default=no]]]),,
               [enable_libstreamanalyzer=no])
 
 if test "x$enable_libstreamanalyzer" != "xno"; then
@@ -577,8 +577,9 @@ if test "x$enable_libstreamanalyzer" != "xno"; then
                      [libstreamanalyzer >= $LIBSTREAMANALYZER_REQUIRED],
                      [have_libstreamanalyzer=yes],
                      [have_libstreamanalyzer=no])
-   AC_SUBST(LIBSTREAMANALYZER_CFLAGS)
-   AC_SUBST(LIBSTREAMANALYZER_LIBS)
+
+   TRACKER_EXTRACT_CFLAGS="$TRACKER_EXTRACT_CFLAGS $LIBSTREAMANALYZER_CFLAGS"
+   TRACKER_EXTRACT_LIBS="$TRACKER_EXTRACT_LIBS $LIBSTREAMANALYZER_LIBS"
 
    if test "x$have_libstreamanalyzer" = "xyes"; then
       AC_DEFINE(HAVE_LIBSTREAMANALYZER, [], [Define if we have libstreamanalyzer])
@@ -788,7 +789,7 @@ fi
 AM_CONDITIONAL(HAVE_HAL, test "x$have_hal" = "xyes")
 
 ##################################################################
-# Check for libxml2
+# Check for libxml2, needed for the HTML extractor
 ##################################################################
 
 AC_ARG_ENABLE(libxml2,
@@ -839,19 +840,18 @@ AC_ARG_ENABLE(qt,
 
 selected_for_albumart="no  (disabled)"
 
-
 ##################################################################
 # Check for Qt needed for the MP3 album art extractor cont
 ##################################################################
 
-
 if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then
    PKG_CHECK_MODULES(QT,
                      [QtGui >= $QT_REQUIRED],
                      [have_qt=yes],
                      [have_qt=no])
-   AC_SUBST(QT_LIBS)
-   AC_SUBST(QT_CFLAGS)
+
+   TRACKER_EXTRACT_CFLAGS="$TRACKER_EXTRACT_CFLAGS $QT_CFLAGS"
+   TRACKER_EXTRACT_LIBS="$TRACKER_EXTRACT_LIBS $QT_LIBS"
 
    if test "x$have_qt" = "xyes"; then
       AC_DEFINE(HAVE_QT, [], [Define if we have Qt])
@@ -878,8 +878,9 @@ if test "x$enable_gdkpixbuf" != "xno" && test "x$enable_quill" != "xyes"; then
                      [gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED],
                      [have_gdkpixbuf=yes],
                      [have_gdkpixbuf=no])
-   AC_SUBST(GDKPIXBUF_LIBS)
-   AC_SUBST(GDKPIXBUF_CFLAGS)
+
+   TRACKER_EXTRACT_CFLAGS="$TRACKER_EXTRACT_CFLAGS $GDKPIXBUF_CFLAGS"
+   TRACKER_EXTRACT_LIBS="$TRACKER_EXTRACT_LIBS $GDKPIXBUF_LIBS"
 
    if test "x$have_gdkpixbuf" = "xyes"; then
       AC_DEFINE(HAVE_GDKPIXBUF, [], [Define if we have GdkPixbuf])
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index a498848..ef267c5 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -11,10 +11,6 @@ AM_CPPFLAGS = 								\
 	-DTRACKER_EXTRACTORS_DIR=\"$(modulesdir)\"			\
 	$(TRACKER_EXTRACT_CFLAGS)
 
-if HAVE_LIBSTREAMANALYZER
-AM_CPPFLAGS += $(LIBSTREAMANALYZER_CFLAGS)
-endif
-
 # NOTE:
 # We don't always link with libtracker-common, we only link
 # against it if we directly use functions in the .so
@@ -351,18 +347,13 @@ endif
 
 if HAVE_LIBSTREAMANALYZER
 tracker_extract_SOURCES += tracker-topanalyzer.cpp tracker-topanalyzer.h
-tracker_extract_LDADD += $(LIBSTREAMANALYZER_LIBS)
 endif
 
 if HAVE_GDKPIXBUF
 tracker_extract_SOURCES += tracker-albumart-pixbuf.c
-tracker_extract_CPPFLAGS = $(GDKPIXBUF_CFLAGS)
-tracker_extract_LDADD += $(GDKPIXBUF_LIBS)
 else
 if HAVE_QT
 tracker_extract_SOURCES += tracker-albumart-qt.cpp
-tracker_extract_CPPFLAGS = $(QT_CFLAGS)
-tracker_extract_LDADD += $(QT_LIBS)
 else
 tracker_extract_SOURCES += tracker-albumart-dummy.c
 endif