From 228e19fb19c64a7a3cf1ace56593c3d0a4ff3db9 Mon Sep 17 00:00:00 2001
From: Marvin Schmidt <marvin_schmidt@gmx.net>
Date: Sat, 1 Aug 2009 08:43:21 +0200
Subject: [PATCH] mad: make check for mad independent of the check for id3tag

Fixes bug #590432.
---
 configure.ac | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4cc9410a03..a38a7f1bcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -310,16 +310,32 @@ AG_GST_CHECK_FEATURE(ID3TAG, [id3tag reading and writing from the MAD project],
 dnl *** mad ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_MAD, true)
 AG_GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [
+
+  dnl check with pkg-config first
+  AG_GST_PKG_CHECK_MODULES(ID3TAG, id3tag >= 0.15)
+  if test "x$HAVE_ID3TAG" = "xno"; then
+    dnl fall back to oldskool detection
+    AC_CHECK_HEADER(id3tag.h, [
+      save_LIBS=$LIBS
+      LIBS="-lz"
+      AC_CHECK_LIB(id3tag, id3_tag_options,
+        HAVE_ID3TAG="yes" ID3TAG_LIBS="-lid3tag -lz")
+      LIBS=$save_LIBS
+      AC_SUBST(ID3TAG_LIBS)
+    ])
+  fi
+
   if test "x$HAVE_ID3TAG" = "xyes"; then
     dnl check with pkg-config first
-    AG_GST_PKG_CHECK_MODULES(MAD, mad >= 0.15 id3tag >= 0.15)
+    AG_GST_PKG_CHECK_MODULES(MAD, mad >= 0.15)
+    MAD_LIBS="$MAD_LIBS $ID3TAG_LIBS"
     if test "x$HAVE_MAD" = "xno"; then
       dnl fall back to oldskool detection
       AC_CHECK_HEADER(mad.h, [
         AC_CHECK_LIB(mad, mad_decoder_finish,
           HAVE_MAD="yes" MAD_LIBS="-lmad $ID3TAG_LIBS")
       ])
-    fi    
+    fi
   else
     HAVE_MAD="no"
     AC_MSG_WARN([libid3tag not available, cannot build MAD MP3 decoder plugin])