oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source 
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.
This commit is contained in:
Max Kellermann
2012-09-25 10:41:39 +02:00
parent 7088a679a2
commit c93a28c641
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -19,7 +19,8 @@ ver 0.17.2 (2012/??/??)
* state_file: save song priorities * state_file: save song priorities
* player: disable cross-fading in "single" mode * player: disable cross-fading in "single" mode
* update: fix unsafe readlink() usage * 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) ver 0.17.1 (2012/07/31)
* protocol: * protocol:

5
configure.ac
View File

@@ -999,6 +999,11 @@ if test x$enable_tremor = xyes; then
AC_MSG_WARN(["OggTremor detected, could not enable Vorbis."]) AC_MSG_WARN(["OggTremor detected, could not enable Vorbis."])
fi fi
enable_vorbis=no 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 fi
MPD_AUTO_PKG(vorbis, VORBIS, [vorbis vorbisfile ogg], MPD_AUTO_PKG(vorbis, VORBIS, [vorbis vorbisfile ogg],