Mercurial > mplayer.hg
comparison configure @ 10726:bae3e8c81ada
use internal (included) libfaad2
author | arpi |
---|---|
date | Sat, 30 Aug 2003 22:31:45 +0000 |
parents | c6c54f467984 |
children | 7436a53876b0 |
comparison
equal
deleted
inserted
replaced
10725:e989150f8216 | 10726:bae3e8c81ada |
---|---|
1075 _mad=auto | 1075 _mad=auto |
1076 _vorbis=auto | 1076 _vorbis=auto |
1077 _theora=auto | 1077 _theora=auto |
1078 _matroska=auto | 1078 _matroska=auto |
1079 _tremor=no | 1079 _tremor=no |
1080 _faad=auto | 1080 _faad=yes |
1081 _xmms=no | 1081 _xmms=no |
1082 _css=auto | 1082 _css=auto |
1083 # dvdnav disabled, it does not work | 1083 # dvdnav disabled, it does not work |
1084 #_dvdnav=no | 1084 #_dvdnav=no |
1085 _dvdread=auto | 1085 _dvdread=auto |
4277 fi | 4277 fi |
4278 echores "$_matroska" | 4278 echores "$_matroska" |
4279 | 4279 |
4280 | 4280 |
4281 echocheck "faad2 (AAC) support" | 4281 echocheck "faad2 (AAC) support" |
4282 if test "$_faad" = auto ; then | 4282 #if test "$_faad" = auto ; then |
4283 _faad=no | 4283 # _faad=no |
4284 cat > $TMPC << EOF | 4284 # cat > $TMPC << EOF |
4285 #include <faad.h> | 4285 ##include <faad.h> |
4286 int main(void) { faacDecHandle testhand; faacDecFrameInfo testinfo; testhand = faacDecOpen(); return 0; } | 4286 #int main(void) { faacDecHandle testhand; faacDecFrameInfo testinfo; testhand = faacDecOpen(); return 0; } |
4287 EOF | 4287 #EOF |
4288 cc_check -lfaad -lm && _faad=yes | 4288 # cc_check -lfaad -lm && _faad=yes |
4289 fi | 4289 #fi |
4290 if test "$_faad" = yes ; then | 4290 if test "$_faad" = yes ; then |
4291 _def_faad='#define HAVE_FAAD 1' | 4291 _def_faad='#define HAVE_FAAD 1' |
4292 _ld_faad='-lfaad' | 4292 _inc_faad="-I`pwd`" |
4293 # _ld_faad='-lfaad' | |
4293 _codecmodules="faad2 $_codecmodules" | 4294 _codecmodules="faad2 $_codecmodules" |
4294 else | 4295 else |
4295 _def_faad='#undef HAVE_FAAD' | 4296 _def_faad='#undef HAVE_FAAD' |
4296 _nocodecmodules="faad2 $_nocodecmodules" | 4297 _nocodecmodules="faad2 $_nocodecmodules" |
4297 fi | 4298 fi |
4298 | 4299 |
4299 if test "$_faad" = yes; then | 4300 if test "$_faad" = yes; then |
4300 cat > $TMPC <<EOF | 4301 cat > $TMPC <<EOF |
4301 #include <faad.h> | 4302 //#include <faad.h> |
4303 #include "libfaad2/faad.h" | |
4302 #ifndef FAAD_MIN_STREAMSIZE | 4304 #ifndef FAAD_MIN_STREAMSIZE |
4303 #error Too old version | 4305 #error Too old version |
4304 #endif | 4306 #endif |
4305 int main(void) { | 4307 int main(void) { |
4306 #ifdef FAAD2_VERSION | 4308 #ifdef FAAD2_VERSION |
4309 printf("1.0"); | 4311 printf("1.0"); |
4310 #endif | 4312 #endif |
4311 return 0; | 4313 return 0; |
4312 } | 4314 } |
4313 EOF | 4315 EOF |
4314 if cc_check $_ld_faad -lm && "$TMPO" >> "$TMPLOG" ; then | 4316 if cc_check $_inc_faad $_ld_faad -lm && "$TMPO" >> "$TMPLOG" ; then |
4315 _faad_version=`"$TMPO"` | 4317 _faad_version=`"$TMPO"` |
4316 _faad_tempversion=`"$TMPO" | sed -e 's/^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1\2/'` | 4318 _faad_tempversion=`"$TMPO" | sed -e 's/^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1\2/'` |
4317 _def_faad_version="#define FAADVERSION $_faad_tempversion" | 4319 _def_faad_version="#define FAADVERSION $_faad_tempversion" |
4318 echores "yes ($_faad_version)" | 4320 echores "yes ($_faad_version)" |
4319 else | 4321 else |