diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-19 16:55:14 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-19 16:55:14 +0000 |
commit | 33154a7188879cc98a43a05432c371a9265b7442 (patch) | |
tree | 5b296e312d7814897b0d41fecf3a2d36b1aee985 /configure | |
parent | 8432755f2ed5caf899270f85a053fac65270c0ac (diff) | |
download | mpv-33154a7188879cc98a43a05432c371a9265b7442.tar.bz2 mpv-33154a7188879cc98a43a05432c371a9265b7442.tar.xz |
gif library incompatibility fixes and prefere libungif over libgif. Patch by Joey Parrish <joey@nicewarrior.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9464 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 36 |
1 files changed, 29 insertions, 7 deletions
@@ -2916,18 +2916,18 @@ int main(void) { return 0; } EOF - if cc_check -lgif && "$TMPO" >> "$TMPLOG" ; then - _gif=yes - _ld_gif="-lgif" - elif cc_check -lungif && "$TMPO" >> "$TMPLOG" ; then + if cc_check -lungif && "$TMPO" >> "$TMPLOG" ; then _gif=yes _ld_gif="-lungif" - elif cc_check -lgif $_ld_x11 && "$TMPO" >> "$TMPLOG" ; then - _gif=yes - _ld_gif="-lgif $_ld_x11" elif cc_check -lungif $_ld_x11 && "$TMPO" >> "$TMPLOG" ; then _gif=yes _ld_gif="-lungif $_ld_x11" + elif cc_check -lgif && "$TMPO" >> "$TMPLOG" ; then + _gif=yes + _ld_gif="-lgif" + elif cc_check -lgif $_ld_x11 && "$TMPO" >> "$TMPLOG" ; then + _gif=yes + _ld_gif="-lgif $_ld_x11" fi fi @@ -2965,6 +2965,27 @@ fi echores "$_gif" +if test "$_gif" = yes ; then + echocheck "broken giflib workaround" + _def_gif_tvt_hack='#define HAVE_GIF_TVT_HACK 1' + + cat > $TMPC << EOF +#include <gif_lib.h> +int main(void) { + GifFileType gif; + printf("UserData is at address %p\n", gif.UserData); + return 0; +} +EOF + if cc_check "$_ld_gif" && ( "$TMPO" ) >>"$TMPLOG" 2>&1 ; then + _def_gif_tvt_hack='#undef HAVE_GIF_TVT_HACK' + echores "disabled" + else + echores "enabled" + fi +fi + + if test "$_vesa" != no ; then echocheck "VESA support" if x86 && linux ; then @@ -5293,6 +5314,7 @@ $_def_jpg /* enable GIF support */ $_def_gif $_def_gif_4 +$_def_gif_tvt_hack /* enable FreeType support */ $_def_freetype |