From 845f8d018b139a38acf00107f1f95c67a69c363e Mon Sep 17 00:00:00 2001
From: Andre Heider
Date: Thu, 19 Mar 2009 18:47:01 +0000
Subject: Extended the FLAC test to detect a libFLAC version which was compiled
 without libogg support

svn-id: r39529
---
 configure | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 82da09a1fa..15658059da 100755
--- a/configure
+++ b/configure
@@ -1502,8 +1502,13 @@ if test "$_flac" = auto ; then
 #include <FLAC/format.h>
 int main(void) { return FLAC__STREAM_SYNC_LEN >> 30; /* guaranteed to be 0 */ }
 EOF
-	cc_check $LDFLAGS $CXXFLAGS $FLAC_CFLAGS $FLAC_LIBS $OGG_CFLAGS $OGG_LIBS \
-		-lFLAC -logg && _flac=yes
+	if test "$_vorbis" = yes ; then
+		cc_check $LDFLAGS $CXXFLAGS $FLAC_CFLAGS $FLAC_LIBS $OGG_CFLAGS $OGG_LIBS \
+			-lFLAC -logg && _flac=yes
+	else
+		cc_check $LDFLAGS $CXXFLAGS $FLAC_CFLAGS $FLAC_LIBS \
+			-lFLAC && _flac=yes
+	fi
 fi
 if test "$_flac" = yes ; then
 	_def_flac='#define USE_FLAC'
-- 
cgit v1.2.3