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-13 17:29:48 +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="")

@@ -170,7 +177,7 @@

 fi

 if test x$enable_shout = xyes; then

-	XIPH_PATH_SHOUT([AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]) MPD_LIBS="$MPD_LIBS $SHOUT_LIBS" MPD_CFLAGS="$MPD_CFLAGS $SHOUT_CFLAGS"], enable_shout=no)

+	XIPH_PATH_SHOUT([AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]) MPD_LIBS="$MPD_LIBS $SHOUT_LIBS" MPD_CFLAGS="$MPD_CFLAGS $SHOUT_CFLAGS $SHOUT_CPPFLAGS"], enable_shout=no)

 fi

 if test x$enable_oss = xyes; then