Mercurial > mplayer.hg
comparison configure @ 17857:115a8e901106
Use _res_comment where appropriate.
author | diego |
---|---|
date | Mon, 13 Mar 2006 21:50:56 +0000 |
parents | 6bd233d56c25 |
children | 8dd9503e4d19 |
comparison
equal
deleted
inserted
replaced
17856:98f0e0542cb6 | 17857:115a8e901106 |
---|---|
2888 cc_check $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break | 2888 cc_check $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break |
2889 done | 2889 done |
2890 fi | 2890 fi |
2891 fi | 2891 fi |
2892 if test "$_pthreads" = yes ; then | 2892 if test "$_pthreads" = yes ; then |
2893 echores "yes (using $_ld_pthread)" | 2893 _res_comment="(using $_ld_pthread)" |
2894 _pthreads='yes' | |
2895 _def_pthreads='#define HAVE_PTHREADS 1' | 2894 _def_pthreads='#define HAVE_PTHREADS 1' |
2896 _def_threads='#define HAVE_THREADS 1' | 2895 _def_threads='#define HAVE_THREADS 1' |
2897 else | 2896 else |
2898 echores "no (v4l, vo_gl, ao_alsa, ao_nas, ao_macosx, win32 loader disabled)" | 2897 _res_comment="(v4l, vo_gl, ao_alsa, ao_nas, ao_macosx, win32 loader disabled)" |
2899 _pthreads='' | |
2900 _def_pthreads='#undef HAVE_PTHREADS' | 2898 _def_pthreads='#undef HAVE_PTHREADS' |
2901 _nas=no ; _tv_v4l=no ; _macosx=no | 2899 _nas=no ; _tv_v4l=no ; _macosx=no |
2902 if not mingw32 ; then | 2900 if not mingw32 ; then |
2903 _win32=no | 2901 _win32=no |
2904 fi | 2902 fi |
2905 fi | 2903 fi |
2904 echores "$_pthreads" | |
2906 | 2905 |
2907 | 2906 |
2908 echocheck "iconv" | 2907 echocheck "iconv" |
2909 if test "$_iconv" = auto ; then | 2908 if test "$_iconv" = auto ; then |
2910 _iconv_tmp='#include <iconv.h>' | 2909 _iconv_tmp='#include <iconv.h>' |
4338 _def_gif='#define HAVE_GIF 1' | 4337 _def_gif='#define HAVE_GIF 1' |
4339 _vosrc="$_vosrc vo_gif89a.c" | 4338 _vosrc="$_vosrc vo_gif89a.c" |
4340 _codecmodules="gif $_codecmodules" | 4339 _codecmodules="gif $_codecmodules" |
4341 _vomodules="gif89a $_vomodules" | 4340 _vomodules="gif89a $_vomodules" |
4342 _mkf_gif="yes" | 4341 _mkf_gif="yes" |
4343 _gif="yes (old version, some encoding functions disabled)" | 4342 _res_comment="(old version, some encoding functions disabled)" |
4344 _def_gif_4='#undef HAVE_GIF_4' | 4343 _def_gif_4='#undef HAVE_GIF_4' |
4345 | 4344 |
4346 cat > $TMPC << EOF | 4345 cat > $TMPC << EOF |
4347 #include <signal.h> | 4346 #include <signal.h> |
4348 #include <gif_lib.h> | 4347 #include <gif_lib.h> |
4354 return 0; | 4353 return 0; |
4355 } | 4354 } |
4356 EOF | 4355 EOF |
4357 if cc_check "$_ld_gif" && tmp_run ; then | 4356 if cc_check "$_ld_gif" && tmp_run ; then |
4358 _def_gif_4='#define HAVE_GIF_4 1' | 4357 _def_gif_4='#define HAVE_GIF_4 1' |
4359 _gif="yes" | 4358 _res_comment="" |
4360 fi | 4359 fi |
4361 else | 4360 else |
4362 _def_gif='#undef HAVE_GIF' | 4361 _def_gif='#undef HAVE_GIF' |
4363 _def_gif_4='#undef HAVE_GIF_4' | 4362 _def_gif_4='#undef HAVE_GIF_4' |
4364 _novomodules="gif89a $_novomodules" | 4363 _novomodules="gif89a $_novomodules" |
5733 # internal faad: check if our dear gcc is able to compile it... | 5732 # internal faad: check if our dear gcc is able to compile it... |
5734 cp "`pwd`/libfaad2/cfft.c" $TMPC | 5733 cp "`pwd`/libfaad2/cfft.c" $TMPC |
5735 if ( cc_check -c -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer -D_GNU_SOURCE $_inc_faad ); then | 5734 if ( cc_check -c -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer -D_GNU_SOURCE $_inc_faad ); then |
5736 _faad_internal=yes | 5735 _faad_internal=yes |
5737 else | 5736 else |
5738 _faad_internal="no (broken gcc)" | 5737 _faad_internal=no |
5738 _res_comment="(broken gcc)" | |
5739 fi | 5739 fi |
5740 fi | 5740 fi |
5741 if test "$_faad_internal" = yes ; then | 5741 if test "$_faad_internal" = yes ; then |
5742 _def_faad_internal="#define USE_INTERNAL_FAAD 1" | 5742 _def_faad_internal="#define USE_INTERNAL_FAAD 1" |
5743 _faad_external=no | 5743 _faad_external=no |