Mercurial > mplayer.hg
comparison configure @ 21149:6b4c5d5b8aa5
Remove _ld_gif and _ld_theora.
author | diego |
---|---|
date | Wed, 22 Nov 2006 09:51:34 +0000 |
parents | 97f77e68b646 |
children | f657369f6bb9 |
comparison
equal
deleted
inserted
replaced
21148:97f77e68b646 | 21149:6b4c5d5b8aa5 |
---|---|
4413 #include <gif_lib.h> | 4413 #include <gif_lib.h> |
4414 int main(void) { | 4414 int main(void) { |
4415 return 0; | 4415 return 0; |
4416 } | 4416 } |
4417 EOF | 4417 EOF |
4418 for _ld_tmp in "-lungif" "-lungif $_ld_x11" "-lgif" "-lgif $_ld_x11" ; do | 4418 for _ld_gif in "-lungif" "-lungif $_ld_x11" "-lgif" "-lgif $_ld_x11" ; do |
4419 cc_check $_ld_tmp && tmp_run && _ld_gif="$_ld_tmp" && _gif=yes && break | 4419 cc_check $_ld_gif && tmp_run && _gif=yes && break |
4420 done | 4420 done |
4421 fi | 4421 fi |
4422 | 4422 |
4423 # If no library was found, and the user wants support forced, | 4423 # If no library was found, and the user wants support forced, |
4424 # then we force it on with libgif, as this is the safest | 4424 # then we force it on with libgif, as this is the safest |
4439 _vosrc="$_vosrc vo_gif89a.c" | 4439 _vosrc="$_vosrc vo_gif89a.c" |
4440 _codecmodules="gif $_codecmodules" | 4440 _codecmodules="gif $_codecmodules" |
4441 _vomodules="gif89a $_vomodules" | 4441 _vomodules="gif89a $_vomodules" |
4442 _res_comment="old version, some encoding functions disabled" | 4442 _res_comment="old version, some encoding functions disabled" |
4443 _def_gif_4='#undef HAVE_GIF_4' | 4443 _def_gif_4='#undef HAVE_GIF_4' |
4444 _ld_extra="$_ld_extra $_ld_gif" | |
4444 | 4445 |
4445 cat > $TMPC << EOF | 4446 cat > $TMPC << EOF |
4446 #include <signal.h> | 4447 #include <signal.h> |
4447 #include <gif_lib.h> | 4448 #include <gif_lib.h> |
4448 void catch() { exit(1); } | 4449 void catch() { exit(1); } |
5675 | 5676 |
5676 return 0; | 5677 return 0; |
5677 } | 5678 } |
5678 EOF | 5679 EOF |
5679 for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora"; do | 5680 for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora"; do |
5680 cc_check $_ld_theora && _theora=yes && break | 5681 cc_check $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" \ |
5682 && theora=yes && break | |
5681 done | 5683 done |
5682 if test "$_theora" = no && test "$_tremor_internal" = yes; then | 5684 if test "$_theora" = no && test "$_tremor_internal" = yes; then |
5683 for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora"; do | 5685 for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora"; do |
5684 cc_check -I. tremor/bitwise.c $_ld_theora && _theora=yes && break | 5686 cc_check -I. tremor/bitwise.c $_ld_theora \ |
5687 && _ld_extra="$_ld_extra $_ld_theora" && theora=yes && break | |
5685 done | 5688 done |
5686 fi | 5689 fi |
5687 fi | 5690 fi |
5688 if test "$_theora" = yes ; then | 5691 if test "$_theora" = yes ; then |
5689 _def_theora='#define HAVE_OGGTHEORA 1' | 5692 _def_theora='#define HAVE_OGGTHEORA 1' |
5692 # $_ld_theora than nothing | 5695 # $_ld_theora than nothing |
5693 test -z "$_ld_theora" && _ld_theora="-ltheora -logg" | 5696 test -z "$_ld_theora" && _ld_theora="-ltheora -logg" |
5694 else | 5697 else |
5695 _def_theora='#undef HAVE_OGGTHEORA' | 5698 _def_theora='#undef HAVE_OGGTHEORA' |
5696 _nocodecmodules="libtheora $_nocodecmodules" | 5699 _nocodecmodules="libtheora $_nocodecmodules" |
5697 _ld_theora="" | |
5698 fi | 5700 fi |
5699 echores "$_theora" | 5701 echores "$_theora" |
5700 | 5702 |
5701 echocheck "mp3lib support" | 5703 echocheck "mp3lib support" |
5702 if test "$_mp3lib" = yes ; then | 5704 if test "$_mp3lib" = yes ; then |
7356 GIF = $_gif | 7358 GIF = $_gif |
7357 | 7359 |
7358 EXTRALIBS = $_extra_libs | 7360 EXTRALIBS = $_extra_libs |
7359 EXTRA_LIB = $_ld_extra \ | 7361 EXTRA_LIB = $_ld_extra \ |
7360 $_ld_static \ | 7362 $_ld_static \ |
7361 $_ld_lm $_ld_gif \ | 7363 $_ld_lm \ |
7362 $_ld_vorbis $_ld_theora $_xmms_lib \ | 7364 $_ld_vorbis $_xmms_lib \ |
7363 $_ld_arch | 7365 $_ld_arch |
7364 EXTRALIBS_MPLAYER = $_libs_mplayer $_ld_x11 $_ld_sock $_ld_static $_ld_gtk $_ld_glib | 7366 EXTRALIBS_MPLAYER = $_libs_mplayer $_ld_x11 $_ld_sock $_ld_static $_ld_gtk $_ld_glib |
7365 EXTRALIBS_MENCODER = $_libs_mencoder | 7367 EXTRALIBS_MENCODER = $_libs_mencoder |
7366 | 7368 |
7367 HAVE_MLIB = $_mlib | 7369 HAVE_MLIB = $_mlib |