Mercurial > mplayer.hg
changeset 21149:6b4c5d5b8aa5
Remove _ld_gif and _ld_theora.
| author | diego |
|---|---|
| date | Wed, 22 Nov 2006 09:51:34 +0000 |
| parents | 97f77e68b646 |
| children | f657369f6bb9 |
| files | configure |
| diffstat | 1 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed Nov 22 09:36:33 2006 +0000 +++ b/configure Wed Nov 22 09:51:34 2006 +0000 @@ -4415,8 +4415,8 @@ return 0; } EOF - for _ld_tmp in "-lungif" "-lungif $_ld_x11" "-lgif" "-lgif $_ld_x11" ; do - cc_check $_ld_tmp && tmp_run && _ld_gif="$_ld_tmp" && _gif=yes && break + for _ld_gif in "-lungif" "-lungif $_ld_x11" "-lgif" "-lgif $_ld_x11" ; do + cc_check $_ld_gif && tmp_run && _gif=yes && break done fi @@ -4441,6 +4441,7 @@ _vomodules="gif89a $_vomodules" _res_comment="old version, some encoding functions disabled" _def_gif_4='#undef HAVE_GIF_4' + _ld_extra="$_ld_extra $_ld_gif" cat > $TMPC << EOF #include <signal.h> @@ -5677,11 +5678,13 @@ } EOF for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora"; do - cc_check $_ld_theora && _theora=yes && break + cc_check $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" \ + && theora=yes && break done if test "$_theora" = no && test "$_tremor_internal" = yes; then for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora"; do - cc_check -I. tremor/bitwise.c $_ld_theora && _theora=yes && break + cc_check -I. tremor/bitwise.c $_ld_theora \ + && _ld_extra="$_ld_extra $_ld_theora" && theora=yes && break done fi fi @@ -5694,7 +5697,6 @@ else _def_theora='#undef HAVE_OGGTHEORA' _nocodecmodules="libtheora $_nocodecmodules" - _ld_theora="" fi echores "$_theora" @@ -7358,8 +7360,8 @@ EXTRALIBS = $_extra_libs EXTRA_LIB = $_ld_extra \ $_ld_static \ - $_ld_lm $_ld_gif \ - $_ld_vorbis $_ld_theora $_xmms_lib \ + $_ld_lm \ + $_ld_vorbis $_xmms_lib \ $_ld_arch EXTRALIBS_MPLAYER = $_libs_mplayer $_ld_x11 $_ld_sock $_ld_static $_ld_gtk $_ld_glib EXTRALIBS_MENCODER = $_libs_mencoder