comparison configure @ 9463:93375ee56629

gif library incompatibility fixes and prefere libungif over libgif. Patch by Joey Parrish <joey@nicewarrior.org>
author alex
date Wed, 19 Feb 2003 16:55:14 +0000
parents 8b02e80e9c65
children 08c717b7b886
comparison
equal deleted inserted replaced
9462:8b02e80e9c65 9463:93375ee56629
2914 #include <gif_lib.h> 2914 #include <gif_lib.h>
2915 int main(void) { 2915 int main(void) {
2916 return 0; 2916 return 0;
2917 } 2917 }
2918 EOF 2918 EOF
2919 if cc_check -lgif && "$TMPO" >> "$TMPLOG" ; then 2919 if cc_check -lungif && "$TMPO" >> "$TMPLOG" ; then
2920 _gif=yes
2921 _ld_gif="-lungif"
2922 elif cc_check -lungif $_ld_x11 && "$TMPO" >> "$TMPLOG" ; then
2923 _gif=yes
2924 _ld_gif="-lungif $_ld_x11"
2925 elif cc_check -lgif && "$TMPO" >> "$TMPLOG" ; then
2920 _gif=yes 2926 _gif=yes
2921 _ld_gif="-lgif" 2927 _ld_gif="-lgif"
2922 elif cc_check -lungif && "$TMPO" >> "$TMPLOG" ; then
2923 _gif=yes
2924 _ld_gif="-lungif"
2925 elif cc_check -lgif $_ld_x11 && "$TMPO" >> "$TMPLOG" ; then 2928 elif cc_check -lgif $_ld_x11 && "$TMPO" >> "$TMPLOG" ; then
2926 _gif=yes 2929 _gif=yes
2927 _ld_gif="-lgif $_ld_x11" 2930 _ld_gif="-lgif $_ld_x11"
2928 elif cc_check -lungif $_ld_x11 && "$TMPO" >> "$TMPLOG" ; then
2929 _gif=yes
2930 _ld_gif="-lungif $_ld_x11"
2931 fi 2931 fi
2932 fi 2932 fi
2933 2933
2934 if test "$_gif" = yes ; then 2934 if test "$_gif" = yes ; then
2935 _def_gif='#define HAVE_GIF 1' 2935 _def_gif='#define HAVE_GIF 1'
2961 _novomodules="gif89a $_novomodules" 2961 _novomodules="gif89a $_novomodules"
2962 _nocodecmodules="gif $_codecmodules" 2962 _nocodecmodules="gif $_codecmodules"
2963 _mkf_gif="no" 2963 _mkf_gif="no"
2964 fi 2964 fi
2965 echores "$_gif" 2965 echores "$_gif"
2966
2967
2968 if test "$_gif" = yes ; then
2969 echocheck "broken giflib workaround"
2970 _def_gif_tvt_hack='#define HAVE_GIF_TVT_HACK 1'
2971
2972 cat > $TMPC << EOF
2973 #include <gif_lib.h>
2974 int main(void) {
2975 GifFileType gif;
2976 printf("UserData is at address %p\n", gif.UserData);
2977 return 0;
2978 }
2979 EOF
2980 if cc_check "$_ld_gif" && ( "$TMPO" ) >>"$TMPLOG" 2>&1 ; then
2981 _def_gif_tvt_hack='#undef HAVE_GIF_TVT_HACK'
2982 echores "disabled"
2983 else
2984 echores "enabled"
2985 fi
2986 fi
2966 2987
2967 2988
2968 if test "$_vesa" != no ; then 2989 if test "$_vesa" != no ; then
2969 echocheck "VESA support" 2990 echocheck "VESA support"
2970 if x86 && linux ; then 2991 if x86 && linux ; then
5291 $_def_jpg 5312 $_def_jpg
5292 5313
5293 /* enable GIF support */ 5314 /* enable GIF support */
5294 $_def_gif 5315 $_def_gif
5295 $_def_gif_4 5316 $_def_gif_4
5317 $_def_gif_tvt_hack
5296 5318
5297 /* enable FreeType support */ 5319 /* enable FreeType support */
5298 $_def_freetype 5320 $_def_freetype
5299 5321
5300 /* liblzo support */ 5322 /* liblzo support */