Merge branch 'v0.17.x'

Conflicts: src/locate.c
2012-09-25 11:39:01 +02:00
parent 1536b5a9d6 ba6ef53ef9
commit e2a574e2a0
9 changed files with 29 additions and 28 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -1021,6 +1021,11 @@ if test x$enable_tremor = xyes; then
 		AC_MSG_WARN(["OggTremor detected, could not enable Vorbis."])
 	fi
 	enable_vorbis=no
+
+	if test x$enable_vorbis_encoder = xauto; then
+		AC_MSG_WARN([OggTremor detected, disabling the Vorbis encoder plugin.])
+		enable_vorbis_encoder=no
+	fi
 fi

 MPD_AUTO_PKG(vorbis, VORBIS, [vorbis vorbisfile ogg],