Use pkg-config for TagLib

configure.in

@@ -107,6 +107,10 @@ if test x$use_flac = xtrue; then
 	PKG_CHECK_MODULES(FLAC, [ flac ])
 fi
 
+if test x$use_musepack = xtrue; then
+	PKG_CHECK_MODULES(TAGLIB, [ taglib_c ])
+fi
+
 if test x$use_ffmpeg = xtrue; then
 	PKG_CHECK_MODULES(FFMPEG, [ libavcodec libavformat ])
 fi
@@ -122,24 +126,6 @@ AC_ARG_WITH(static-libs,
 AC_CHECK_HEADERS(getopt.h,,)
 AC_CHECK_HEADERS(stdint.h,,)
 
-if test x$use_musepack = xtrue; then
-  AC_PATH_PROG(TAGLIB_CONFIG, taglib-config, no)
-  AC_CHECK_HEADERS(taglib/tag_c.h,, [
-   AC_MSG_ERROR([taglib/tag_c.h not found... TagLib must be installed for Musepack support])])
-  if test "x$TAGLIB_CONFIG" = "xno" ; then
-    AC_MSG_ERROR(['TagLib must be installed for Musepack support'])
-  fi
-dnl  if test ! -e "`taglib-config --prefix`/lib/libtag_c.so.0"; then
-dnl        AC_MSG_ERROR(['Taglib C bindings are not installed'])
-dnl  fi
-
-  if test x"$STATIC_LIBS" != x"no"; then
-    LIBS="${LIBS} ${STATIC_LIBS}/libtag_c.a"
-  else
-    LIBS="${LIBS} -ltag_c"
-  fi
-fi
-
 AC_REPLACE_FUNCS(strcasestr)
 AC_REPLACE_FUNCS(strsep)
 AC_CHECK_FUNCS(atoll)

src/Makefile.am

@@ -24,8 +24,8 @@ endif
 
 wavstreamer_SOURCES = wavstreamer.c
 
-mt_daapd_CPPFLAGS = @AVAHI_CFLAGS@ @SQLITE3_CFLAGS@ @ID3TAG_CFLAGS@ @OGGVORBIS_CFLAGS@
-mt_daapd_LDADD = @AVAHI_LIBS@ @SQLITE3_LIBS@ @ID3TAG_LIBS@ @OGGVORBIS_LIBS@ @FLAC_LIBS@
+mt_daapd_CPPFLAGS = @AVAHI_CFLAGS@ @SQLITE3_CFLAGS@ @ID3TAG_CFLAGS@ @OGGVORBIS_CFLAGS@ @TAGLIB_CFLAGS@
+mt_daapd_LDADD = @AVAHI_LIBS@ @SQLITE3_LIBS@ @ID3TAG_LIBS@ @OGGVORBIS_LIBS@ @FLAC_LIBS@ @TAGLIB_LIBS@
 mt_daapd_SOURCES = main.c daapd.h rend.h webserver.c \
 	webserver.h configfile.c configfile.h err.c err.h restart.c restart.h \
 	mp3-scanner.h mp3-scanner.c \