Mercurial > mplayer.hg
comparison configure @ 10921:3eda9985bc7d
10l really disable faad if gcc is broken
author | faust3 |
---|---|
date | Sun, 21 Sep 2003 17:05:51 +0000 |
parents | fbd70b450d32 |
children | e2be5ab1d6e3 |
comparison
equal
deleted
inserted
replaced
10920:e4cda4f51981 | 10921:3eda9985bc7d |
---|---|
4299 _noinputmodules="matroska $_noinputmodules" | 4299 _noinputmodules="matroska $_noinputmodules" |
4300 fi | 4300 fi |
4301 echores "$_matroska" | 4301 echores "$_matroska" |
4302 | 4302 |
4303 echocheck "faad2 (AAC) support" | 4303 echocheck "faad2 (AAC) support" |
4304 _def_faad_internal="#undef USE_INTERNAL_FAAD" | |
4304 if test "$_faad" = no ; then | 4305 if test "$_faad" = no ; then |
4305 echores "no (disabled)" | 4306 echores "no (disabled)" |
4306 else | 4307 else |
4307 if test "$_faad_local" = no ; then | 4308 if test "$_faad_local" = no ; then |
4308 _ld_faad='-lfaad' | 4309 _ld_faad='-lfaad' |
4328 fi | 4329 fi |
4329 # internal faad: check if our dear gcc is able to compile it... | 4330 # internal faad: check if our dear gcc is able to compile it... |
4330 echo "$_cc -c -O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer $CFLAGS $_inc_faad $_inc_extra `pwd`/libfaad2/cfft.c -o $TMPO" >> "$TMPLOG" | 4331 echo "$_cc -c -O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer $CFLAGS $_inc_faad $_inc_extra `pwd`/libfaad2/cfft.c -o $TMPO" >> "$TMPLOG" |
4331 if ( $_cc -c -O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer $CFLAGS $_inc_faad $_inc_extra "`pwd`/libfaad2/cfft.c" -o "$TMPO" ) >> "$TMPLOG" 2>&1 ; then | 4332 if ( $_cc -c -O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer $CFLAGS $_inc_faad $_inc_extra "`pwd`/libfaad2/cfft.c" -o "$TMPO" ) >> "$TMPLOG" 2>&1 ; then |
4332 echores "$_faad (internal)" | 4333 echores "$_faad (internal)" |
4334 _def_faad_internal="#define USE_INTERNAL_FAAD 1" | |
4333 else | 4335 else |
4334 _faad=no | 4336 _faad=no |
4337 _faad_local=no | |
4335 echores "no (broken gcc)" | 4338 echores "no (broken gcc)" |
4336 fi | 4339 fi |
4337 # remove a temporarily config.h, which was needed for the faad compile check | 4340 # remove a temporarily config.h, which was needed for the faad compile check |
4338 if test "$_rm_config_h" = yes; then | 4341 if test "$_rm_config_h" = yes; then |
4339 rm config.h | 4342 rm config.h |
5587 LIBLZO_LIB= $_ld_liblzo | 5590 LIBLZO_LIB= $_ld_liblzo |
5588 MAD_LIB = $_ld_mad | 5591 MAD_LIB = $_ld_mad |
5589 VORBIS_LIB = $_ld_vorbis $_ld_libdv | 5592 VORBIS_LIB = $_ld_vorbis $_ld_libdv |
5590 THEORA_LIB = $_ld_theora | 5593 THEORA_LIB = $_ld_theora |
5591 FAAD_LIB = $_ld_faad | 5594 FAAD_LIB = $_ld_faad |
5595 INTERNAL_FAAD = $_faad_local | |
5592 SMBSUPPORT_LIB = $_ld_smb | 5596 SMBSUPPORT_LIB = $_ld_smb |
5593 XMMS_PLUGINS = $_xmms | 5597 XMMS_PLUGINS = $_xmms |
5594 XMMS_LIB = $_xmms_lib | 5598 XMMS_LIB = $_xmms_lib |
5595 MACOSX = $_macosx | 5599 MACOSX = $_macosx |
5596 MACOSX_FRAMEWORKS = $_macosx_frameworks | 5600 MACOSX_FRAMEWORKS = $_macosx_frameworks |
6034 /* enable Matroska support */ | 6038 /* enable Matroska support */ |
6035 $_def_matroska | 6039 $_def_matroska |
6036 | 6040 |
6037 /* enable FAAD (AAC) support */ | 6041 /* enable FAAD (AAC) support */ |
6038 $_def_faad | 6042 $_def_faad |
6043 $_def_faad_internal | |
6039 $_def_faad_version | 6044 $_def_faad_version |
6040 | 6045 |
6041 /* enable network */ | 6046 /* enable network */ |
6042 $_def_network | 6047 $_def_network |
6043 | 6048 |