aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Heider2009-03-19 18:47:01 +0000
committerAndre Heider2009-03-19 18:47:01 +0000
commit845f8d018b139a38acf00107f1f95c67a69c363e (patch)
treef735a8fc838814c9192751bf9e104a9568f93baa
parent2292dc28b06e57d83685a29f0749f38d698b542e (diff)
downloadscummvm-rg350-845f8d018b139a38acf00107f1f95c67a69c363e.tar.gz
scummvm-rg350-845f8d018b139a38acf00107f1f95c67a69c363e.tar.bz2
scummvm-rg350-845f8d018b139a38acf00107f1f95c67a69c363e.zip
Extended the FLAC test to detect a libFLAC version which was compiled without libogg support
svn-id: r39529
-rwxr-xr-xconfigure9
1 files changed, 7 insertions, 2 deletions
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'