# HG changeset patch
# User nenolod
# Date 1171705274 28800
# Node ID fb0196e8f03f794f834e467dc85acaefb8036b49
# Parent  7b65072e2efb6681508911620131ec8d19cf8942
[svn] - remove a bunch of audacious-core cruft
- make taglib unavailability not cause configure to die

diff -r 7b65072e2efb -r fb0196e8f03f ChangeLog
--- a/ChangeLog	Sat Feb 17 01:34:18 2007 -0800
+++ b/ChangeLog	Sat Feb 17 01:41:14 2007 -0800
@@ -1,3 +1,11 @@
+2007-02-17 09:34:18 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1408]
+  - id3tag.h -> audacious/id3tag.h
+  
+  trunk/src/tta/aud-tta.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2007-02-17 09:32:56 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1406]
   - id3tag.h -> audacious/id3tag.h
diff -r 7b65072e2efb -r fb0196e8f03f configure.ac
--- a/configure.ac	Sat Feb 17 01:34:18 2007 -0800
+++ b/configure.ac	Sat Feb 17 01:41:14 2007 -0800
@@ -124,23 +124,6 @@
     [AC_MSG_ERROR([Cannot find pango >= 1.8.0])]
 )
 
-dnl Check for libglade
-
-PKG_CHECK_MODULES(LIBGLADE, [libglade-2.0 >= 2.3.1],
-    [],
-    [AC_MSG_ERROR([Cannot find libglade])]
-)
-
-AC_PATH_PROG(TAGLIB_CONFIG, taglib-config, [no], [$PATH:$prefix/bin])
-if test "x$TAGLIB_CONFIG" = "xno" ; then
-AC_MSG_ERROR([Cannot find taglib])
-else
-    TAGLIB_CFLAGS=[`$TAGLIB_CONFIG --cflags`]
-    TAGLIB_LIBS=[`$TAGLIB_CONFIG --libs`]
-fi
-AC_SUBST(TAGLIB_CFLAGS)
-AC_SUBST(TAGLIB_LIBS)
-
 dnl IPv6 support
 dnl ========================
 AC_ARG_ENABLE(ipv6,
@@ -205,32 +188,6 @@
 		;;
 esac
 
-dnl GConf support
-
-AC_ARG_ENABLE( gconf,
-    [  --enable-gconf          enable GConf support (default=disabled)],
-    [enable_gconf=$enableval],
-    [enable_gconf="no"]
-)
-
-if test "$enable_gconf" = "yes"; then
-    PKG_CHECK_MODULES(GCONF, [gconf-2.0 >= 2.6.0],
-        [
-         AC_DEFINE(HAVE_GCONF, , [Define if building with GConf support])
-         ADD_PC_REQUIRES([gconf-2.0 >= 2.6.0])
-        ],
-        [AC_MSG_ERROR([Cannot find GConf])]
-    )
-fi
-
-if test "$enable_gconf" = "yes"; then
-	CONFIGDB_BACKEND="gconf"
-else
-	CONFIGDB_BACKEND="rcfile"
-fi
-
-AC_SUBST(CONFIGDB_BACKEND)
-
 dnl Check for esound
 
 AC_ARG_ENABLE( esd,
@@ -572,9 +529,11 @@
 )
 
 if test "$enable_musepack" = "yes"; then
-    AC_CHECK_HEADERS(mpcdec/config_types.h,,
-        enable_musepack=no
-    )
+    PKG_CHECK_MODULES(TAGLIB, [taglib >= 1.4], [ 
+       AC_CHECK_HEADERS(mpcdec/config_types.h,, [
+           enable_musepack=no
+       ])
+    ], [enable_musepack=no])
 else
     AC_MSG_RESULT([*** Musepack plugin disabled per user request ***])
     enable_musepack=no