configure.ac: don't auto-detect the Vorbis encoder when Tremor is enabled

libvorbisidec and libvorbis export the same symbols, which is a dangerous thing. Since libvorbisenc depends on libvorbis, this can get nasty, so let's disable the Vorbis encoder unless the user explicitly wants it.

configure.ac: don't auto-detect the Vorbis encoder when Tremor is enabled
c93a28c6 · Max Kellermann · 7088a679 · c93a28c6 · c93a28c6
Commit c93a28c6 authored Sep 25, 2012 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

NEWS NEWS +2 -1

configure.ac configure.ac +5 -0

No files found.
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,8 @@ ver 0.17.2 (2012/??/??)
 * state_file: save song priorities
 * player: disable cross-fading in "single" mode
 * update: fix unsafe readlink() usage
-
+* configure.ac:
+  - don't auto-detect the vorbis encoder when Tremor is enabled

 ver 0.17.1 (2012/07/31)
 * protocol:

--- a/configure.ac
+++ b/configure.ac
@@ -999,6 +999,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],