fix tremor and libmad detection

configure.ac

@@ -253,7 +253,14 @@ AC_ARG_ENABLE(lsr,
 	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="")
 
@@ -460,7 +467,9 @@ AM_CONDITIONAL(HAVE_ID3TAG, test x$enable_id3 = xyes)
 if test x$enable_mp3 = xyes; then
 	PKG_CHECK_MODULES([MAD], [mad],
 		AC_DEFINE(HAVE_MAD, 1, [Define to use libmad]),
-		enable_mp3=no)
+		PKG_CHECK_MODULES([MAD], [libmad],
+			AC_DEFINE(HAVE_MAD, 1, [Define to use libmad]),
+		enable_mp3=no))
 fi
 
 AM_CONDITIONAL(HAVE_MAD, test x$enable_mp3 = xyes)