[tracker/albumart-quill] Moved the configure check for QUILL to a separate item

[Philip Van Hoof <pvanhoof src gnome org>]

commit a397a0fc44e54b998b3c3d9df6be20cc3c9b484a
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Nov 2 17:07:31 2009 +0100

    Moved the configure check for QUILL to a separate item

 configure.ac |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 935ff61..c3b14c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -448,7 +448,7 @@ fi
 AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes")
 
 ##################################################################
-# Check for GdkPixbuf or QUILL, needed for the MP3 album art extractor
+# Check for GdkPixbuf needed for the MP3 album art extractor
 ##################################################################
 
 AC_ARG_ENABLE(gdkpixbuf, 
@@ -467,13 +467,7 @@ if test "x$enable_gdkpixbuf" != "xno"; then
    if test "x$have_gdkpixbuf" = "xyes"; then
       AC_DEFINE(HAVE_GDKPIXBUF, [], [Define if we have GdkPixbuf])
    fi
-
-   have_quill="no"
 else
-   PKG_CHECK_MODULES(QUILL, 
-		     [quill >= $QUILL_REQUIRED], 
-		     [have_quill=yes], 
-		     [have_quill=no])
    have_gdkpixbuf="no  (disabled)"
 fi
 
@@ -484,8 +478,39 @@ if test "x$enable_gdkpixbuf" = "xyes"; then
 fi
 
 AM_CONDITIONAL(HAVE_GDKPIXBUF, test "x$have_gdkpixbuf" = "xyes")
-AM_CONDITIONAL(HAVE_QUILL, test "x$have_quill" = "xyes")
 
+##################################################################
+# Check for QUILL optionally needed for the MP3 album art 
+# extractor
+##################################################################
+
+AC_ARG_ENABLE(quill,
+              AS_HELP_STRING([--enable-quill],
+                             [enable QUILL support, (MP3 album art) [[default=auto]]]),,
+              [enable_quill=auto])
+
+if test "x$enable_quill" != "xno"; then
+   PKG_CHECK_MODULES(QUILL,
+		     [quill >= $QUILL_REQUIRED],
+		     [have_quill=yes],
+		     [have_quill=no])
+   AC_SUBST(QUILL_LIBS)
+   AC_SUBST(QUILL_CFLAGS)
+
+   if test "x$have_quill" = "xyes"; then
+      AC_DEFINE(HAVE_QUILL, [], [Define if we have QUILL])
+   fi
+else
+   have_quill="no  (disabled)"
+fi
+
+if test "x$enable_quill" = "xyes"; then
+   if test "x$have_quill" != "xyes"; then
+      AC_MSG_ERROR([Couldn't find QUILL >= $GDKPIXBUF_QUILL.])
+   fi
+fi
+
+AM_CONDITIONAL(HAVE_QUILL, test "x$have_quill" = "xyes")
 
 ####################################################################
 # Check for GStreamer or Xine. Otherwise, call an external video
@@ -1513,6 +1538,7 @@ Metadata Extractors:
 	Support video formats:			$have_video_handler ($have_video_handler_app) (tagreadbin: $enable_tagreadbin)
 	Support helix formats (RPM/RM/etc):     $have_gstreamer_helix
 	Support MP3 album art (w/ GdkPixbuf):	$have_gdkpixbuf
+        Support MP3 album art (w/ QUILL):       $have_quill
 	Support playlists (w/ Totem):           $have_playlist
 
 Plugins: