diff -urN mpd-0.13.0.orig/aclocal.m4 mpd-0.13.0/aclocal.m4
--- mpd-0.13.0.orig/aclocal.m4	2007-05-28 16:19:57 +0300
+++ mpd-0.13.0/aclocal.m4	2007-09-09 02:31:15 +0300
@@ -7497,7 +7497,7 @@
 AC_PATH_PROG([PKGCONFIG], [pkg-config], [no])
 if test "$PKGCONFIG" != "no" && `$PKGCONFIG --exists shout`
 then
-  SHOUT_CFLAGS=`$PKGCONFIG --variable=cflags_only shout`
+  SHOUT_CFLAGS=`$PKGCONFIG --cflags shout`
   SHOUT_CPPFLAGS=`$PKGCONFIG --variable=cppflags shout`
   SHOUT_LIBS=`$PKGCONFIG --libs shout`
   xt_have_shout="maybe"
diff -urN mpd-0.13.0.orig/configure mpd-0.13.0/configure
--- mpd-0.13.0.orig/configure	2007-05-28 16:20:18 +0300
+++ mpd-0.13.0/configure	2007-09-09 02:31:04 +0300
@@ -24057,7 +24057,7 @@
 
 if test "$PKGCONFIG" != "no" && `$PKGCONFIG --exists shout`
 then
-  SHOUT_CFLAGS=`$PKGCONFIG --variable=cflags_only shout`
+  SHOUT_CFLAGS=`$PKGCONFIG --cflags shout`
   SHOUT_CPPFLAGS=`$PKGCONFIG --variable=cppflags shout`
   SHOUT_LIBS=`$PKGCONFIG --libs shout`
   xt_have_shout="maybe"
diff -urN mpd-0.13.0.orig/configure.ac mpd-0.13.0/configure.ac
--- mpd-0.13.0.orig/configure.ac	2007-05-28 16:19:32 +0300
+++ mpd-0.13.0/configure.ac	2007-09-09 02:30:49 +0300
@@ -81,7 +81,14 @@
 AC_ARG_ENABLE(id3,[  --disable-id3           disable id3 support (default: enable)],[enable_id3=$enableval],[enable_id3=yes])
 AC_ARG_ENABLE(lsr,[  --disable-lsr           disable libsamplerate support (default: enable)],[enable_lsr=$enableval],[enable_lsr=yes])
 
-AC_ARG_WITH(tremor,[[  --with-tremor[=PFX]         Use Tremor(vorbisidec) integer Ogg-Vorbis decoder (with optional prefix)]], use_tremor=yes; test x$withval != xyes && tremor_prefix="$withval",)
+AC_ARG_WITH(tremor,[[  --with-tremor[=PFX]         Use Tremor(vorbisidec) integer Ogg-Vorbis decoder (with optional prefix)]],
+  if test "x$withval" = xyes -o "x$withval" = xno; then
+    use_tremor="$withval"
+  else
+    use_tremor=yes
+    tremor_prefix="$withval"
+  fi
+,)
 AC_ARG_WITH(tremor-libraries,[  --with-tremor-libraries=DIR Directory where Tremor library is installed (optional)], tremor_libraries="$withval", tremor_libraries="")
 AC_ARG_WITH(tremor-includes,[  --with-tremor-includes=DIR  Directory where Tremor header files are installed (optional)], tremor_includes="$withval", tremor_includes="")