diff options
| author | Max Kellermann <max@duempel.org> | 2011-04-12 07:39:01 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-04-12 07:39:01 +0200 |
| commit | def2fe8805d575c4be403f1c28aac70d87759d55 (patch) | |
| tree | c649067a4984b1ef20daf7e8f2f813d5342046d2 /configure.ac | |
| parent | f680b0a431b35fa5a005fec27899d4b18f664f3c (diff) | |
| parent | d4b00ff11cf102d8982ef342371acfa16ed2e515 (diff) | |
| download | mpd-def2fe8805d575c4be403f1c28aac70d87759d55.tar.gz mpd-def2fe8805d575c4be403f1c28aac70d87759d55.tar.xz mpd-def2fe8805d575c4be403f1c28aac70d87759d55.zip | |
Merge branch 'v0.15.x' into v0.16.x
Conflicts:
NEWS
configure.ac
src/listen.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index cc907a31c..184f0dcb0 100644 --- a/configure.ac +++ b/configure.ac @@ -1081,7 +1081,7 @@ if fi AM_CONDITIONAL(HAVE_OGG_COMMON, - test x$enable_vorbis = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes) + test x$enable_vorbis = xyes || test x$enable_tremor = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes) AM_CONDITIONAL(HAVE_FLAC_COMMON, test x$enable_flac = xyes || test x$enable_oggflac = xyes) |