Mercurial > mplayer.hg
comparison configure @ 19354:cd767a4c8b94
-logg must come before -lvorbisidec since both declare the same symbols.
Otherwise demux_ogg will take have the functions from libogg and the other half
from libvorbisidec, ending in a crash
| author | reimar |
|---|---|
| date | Tue, 08 Aug 2006 11:55:23 +0000 |
| parents | 12438ab529f9 |
| children | c97b028f0e6b |
comparison
equal
deleted
inserted
replaced
| 19353:12438ab529f9 | 19354:cd767a4c8b94 |
|---|---|
| 5563 _tremor_external=no | 5563 _tremor_external=no |
| 5564 cat > $TMPC << EOF | 5564 cat > $TMPC << EOF |
| 5565 #include <tremor/ivorbiscodec.h> | 5565 #include <tremor/ivorbiscodec.h> |
| 5566 int main(void) { vorbis_packet_blocksize(0,0); return 0; } | 5566 int main(void) { vorbis_packet_blocksize(0,0); return 0; } |
| 5567 EOF | 5567 EOF |
| 5568 cc_check -lvorbisidec -logg $_ld_lm && _tremor_external=yes && _libvorbis=no | 5568 cc_check -logg -lvorbisidec $_ld_lm && _tremor_external=yes && _libvorbis=no |
| 5569 fi | 5569 fi |
| 5570 if test "$_libvorbis" = auto; then | 5570 if test "$_libvorbis" = auto; then |
| 5571 _libvorbis=no | 5571 _libvorbis=no |
| 5572 cat > $TMPC << EOF | 5572 cat > $TMPC << EOF |
| 5573 #include <vorbis/codec.h> | 5573 #include <vorbis/codec.h> |
| 5589 _vorbis=yes | 5589 _vorbis=yes |
| 5590 _def_vorbis='#define HAVE_OGGVORBIS 1' | 5590 _def_vorbis='#define HAVE_OGGVORBIS 1' |
| 5591 _def_tremor='#define TREMOR 1' | 5591 _def_tremor='#define TREMOR 1' |
| 5592 _codecmodules="tremor(external) $_codecmodules" | 5592 _codecmodules="tremor(external) $_codecmodules" |
| 5593 _res_comment="external Tremor" | 5593 _res_comment="external Tremor" |
| 5594 _ld_vorbis='-lvorbisidec -logg' | 5594 _ld_vorbis='-logg -lvorbisidec' |
| 5595 elif test "$_libvorbis" = yes ; then | 5595 elif test "$_libvorbis" = yes ; then |
| 5596 _vorbis=yes | 5596 _vorbis=yes |
| 5597 _def_vorbis='#define HAVE_OGGVORBIS 1' | 5597 _def_vorbis='#define HAVE_OGGVORBIS 1' |
| 5598 _codecmodules="libvorbis $_codecmodules" | 5598 _codecmodules="libvorbis $_codecmodules" |
| 5599 _res_comment="libvorbis" | 5599 _res_comment="libvorbis" |