From b6c8de6e017feb5b92815b5635cdb28eedc396dc Mon Sep 17 00:00:00 2001
From: Avuton Olrich <avuton@gmail.com>
Date: Sat, 17 Apr 2010 04:08:08 -0700
Subject: configure.ac: Move tremor/oggflac test under oggflac.

---
 configure.ac | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 333a27669..64d21dce9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1069,18 +1069,20 @@ fi
 if test x$use_tremor = xyes; then
 	AC_DEFINE(HAVE_TREMOR,1,
 		[Define to use tremor (libvorbisidec) for ogg support])
-	if test x$enable_oggflac = xyes; then
-		AC_MSG_WARN([disabling OggFLAC support because it is incompatible with tremor])
-		enable_oggflac=no
-	fi
 fi
 
 AC_SUBST(TREMOR_CFLAGS)
 AC_SUBST(TREMOR_LIBS)
 
 dnl --------------------------------- OggFLAC ---------------------------------
-dnl OggFLAC must go after Ogg Tremor 
-if test x$enable_oggflac = xyes; then
+dnl OggFLAC must go after Ogg Tremor
+
+if test x$use_tremor = xyes -a test $xenable_oggflac = yes; then
+	AC_MSG_WARN([disabling OggFLAC support because it is incompatible with tremor])
+		enable_oggflac=no
+fi
+
+if test x$enable_oggflac = xyes; then	
 	oldmpdcflags="$MPD_CFLAGS"
 	oldmpdlibs="$MPD_LIBS"
 	AM_PATH_LIBOGGFLAC(MPD_LIBS="$MPD_LIBS $LIBOGGFLAC_LIBS"
-- 
cgit v1.2.3