aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 02d860b14..68f40190e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -970,8 +970,11 @@ fi
AM_CONDITIONAL(HAVE_OGGFLAC, test x$enable_oggflac = xyes)
dnl -------------------------------- Ogg Vorbis -------------------------------
-if test x$enable_tremor != xno && test x$enable_vorbis = xyes; then
- if test x$enable_ogg = xyes; then
+if test x$enable_vorbis = xyes; then
+ if test x$use_tremor = xyes; then
+ AC_MSG_WARN(["OggTremor detected, could not enable Vorbis."])
+ enable_vorbis=no
+ elif test x$enable_ogg = xyes; then
PKG_CHECK_MODULES(VORBIS, [vorbis vorbisfile],
AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support]),
enable_vorbis=no)