diff options
| author | Max Kellermann <max@duempel.org> | 2012-09-25 11:39:01 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-09-25 11:39:01 +0200 |
| commit | e2a574e2a00803f45ed6f60154f01dd2ccc8444a (patch) | |
| tree | 7bb07fc285c00d01bd0d7fb1314c49ad39cb9232 /configure.ac | |
| parent | 1536b5a9d602688354648106ca8d0e34cac3c933 (diff) | |
| parent | ba6ef53ef95dfd48ce0e5dd161b3199b431044ed (diff) | |
Merge branch 'v0.17.x'
Conflicts:
src/locate.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index c72dfdf1..702980a2 100644 --- 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], |