From c93a28c641be7c89fee5a00f11cbfec14d8f71d8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 25 Sep 2012 10:41:39 +0200 Subject: [PATCH] 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. --- NEWS | 3 ++- configure.ac | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index fe9d77542..19f86e8a7 100644 --- 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: diff --git a/configure.ac b/configure.ac index f9062934f..87106a4f2 100644 --- 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],