diff options
| author | Max Kellermann <max@duempel.org> | 2011-04-12 08:11:33 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-04-12 08:11:33 +0200 |
| commit | c2ada39fd3037a0f6180326ecb5fa5913b719326 (patch) | |
| tree | 68c2f36831283553a5a2e12f2b4f3ad3dd91100f /configure.ac | |
| parent | 77b6e275008743fbd27f423d42d92f74518a5b28 (diff) | |
| parent | def2fe8805d575c4be403f1c28aac70d87759d55 (diff) | |
Merge branch 'v0.16.x'
Conflicts:
NEWS
configure.ac
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 dbf84c0b..7ea76aa5 100644 --- a/configure.ac +++ b/configure.ac @@ -1120,7 +1120,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) |