forked from pool/scummvm
25 lines
653 B
Diff
25 lines
653 B
Diff
|
--- configure
|
||
|
|
+++ configure
|
||
|
|
@@ -1414,7 +1414,7 @@
|
||
|
|
fi
|
||
|
|
if test "$_vorbis" = yes ; then
|
||
|
|
_def_vorbis='#define USE_VORBIS'
|
||
|
|
- LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisfile -lvorbis -logg"
|
||
|
|
+ LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisfile"
|
||
|
|
INCLUDES="$INCLUDES $OGG_CFLAGS $VORBIS_CFLAGS"
|
||
|
|
else
|
||
|
|
_def_vorbis='#undef USE_VORBIS'
|
||
|
|
@@ -1464,11 +1464,7 @@
|
||
|
|
fi
|
||
|
|
if test "$_flac" = yes ; then
|
||
|
|
_def_flac='#define USE_FLAC'
|
||
|
|
- if test "$_vorbis" = yes ; then
|
||
|
|
- LIBS="$LIBS $FLAC_LIBS $OGG_LIBS -lFLAC -logg"
|
||
|
|
- else
|
||
|
|
- LIBS="$LIBS $FLAC_LIBS -lFLAC"
|
||
|
|
- fi
|
||
|
|
+ LIBS="$LIBS $FLAC_LIBS -lFLAC"
|
||
|
|
INCLUDES="$INCLUDES $FLAC_CFLAGS"
|
||
|
|
else
|
||
|
|
_def_flac='#undef USE_FLAC'
|