# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1207941090 -10800
# Node ID e71b43cae233b9878c204b654fd4e386f57b70e3
# Parent  9c40eb4bc22d8cd53975f12ae2920d5192823a89
Backed out changeset 6677949e662d. The Makefile change makes absolutely NO
sense. The configdb.h struct hack is needed because of #define mess in
certain libmcs versions, #including <libmcs/mcs.h> results in lots of
noisy warnings.

diff -r 9c40eb4bc22d -r e71b43cae233 src/audacious/configdb.h
--- a/src/audacious/configdb.h	Fri Apr 11 19:30:08 2008 +0200
+++ b/src/audacious/configdb.h	Fri Apr 11 22:11:30 2008 +0300
@@ -2,7 +2,8 @@
 #define CONFIGDB_H
 
 #include <glib.h>
-#include <libmcs/mcs.h>
+
+typedef struct mcs_handle_ mcs_handle_t;
 
 G_BEGIN_DECLS
 
diff -r 9c40eb4bc22d -r e71b43cae233 src/libid3tag/Makefile
--- a/src/libid3tag/Makefile	Fri Apr 11 19:30:08 2008 +0200
+++ b/src/libid3tag/Makefile	Fri Apr 11 22:11:30 2008 +0300
@@ -27,10 +27,6 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-CPPFLAGS += ${LIB_CPPFLAGS}		\
-			${GLIB_CFLAGS}		\
-			${GTK_CFLAGS}		\
-			${LIBMCS_CFLAGS}	\
-			${MOWGLI_CFLAGS}
+CPPFLAGS += ${LIB_CPPFLAGS} -I.. ${GLIB_CFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS}
 CFLAGS += ${LIB_CFLAGS}
 LIBS += ${IMPLIB_LIBS} ${GLIB_LIBS} ${GTK_LIBS} ${MOWGLI_LIBS} -lz