From c93a28c641be7c89fee5a00f11cbfec14d8f71d8 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 25 Sep 2012 10:41:39 +0200
Subject: 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 | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index f9062934..87106a4f 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],
-- 
cgit v1.2.3