diff -urN mpd-0.12.1.orig/configure mpd-0.12.1/configure
--- mpd-0.12.1.orig/configure	2006-10-11 02:57:30 +0300
+++ mpd-0.12.1/configure	2007-01-10 18:56:56 +0200
@@ -18970,7 +18970,13 @@
 # Check whether --with-tremor or --without-tremor was given.
 if test "${with_tremor+set}" = set; then
   withval="$with_tremor"
-  use_tremor=yes; test x$withval != xyes && tremor_prefix="$withval"
+  if test "x$withval" = xyes -o "x$withval" = xno; then
+    use_tremor="$withval"
+  else
+    use_tremor=yes
+    tremor_prefix="$withval"
+  fi
+
 fi;
 
 # Check whether --with-tremor-libraries or --without-tremor-libraries was given.
diff -urN mpd-0.12.1.orig/configure.ac mpd-0.12.1/configure.ac
--- mpd-0.12.1.orig/configure.ac	2006-10-11 02:56:58 +0300
+++ mpd-0.12.1/configure.ac	2007-01-10 18:56:28 +0200
@@ -81,7 +81,14 @@
 AC_ARG_ENABLE(mpc,[  --disable-mpc           disable musepack (MPC) support (default: enable)],[enable_mpc=$enableval],[enable_mpc=yes])
 AC_ARG_ENABLE(id3,[  --disable-id3           disable id3 support (default: enable)],[enable_id3=$enableval],[enable_id3=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="")