[Scummvm-cvs-logs] SF.net SVN: scummvm:[39529] scummvm/trunk/configure

[dhewg at users.sourceforge.net]

Revision: 39529
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39529&view=rev
Author:   dhewg
Date:     2009-03-19 18:47:01 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
Extended the FLAC test to detect a libFLAC version which was compiled without libogg support

Modified Paths:
--------------
    scummvm/trunk/configure

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-03-19 18:39:47 UTC (rev 39528)
+++ scummvm/trunk/configure	2009-03-19 18:47:01 UTC (rev 39529)
@@ -1502,8 +1502,13 @@
 #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'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.