Mercurial > mplayer.hg
changeset 15456:67f45112c49c
Make FAAC detection follow standard enable/disable/auto semantics.
| author | diego |
|---|---|
| date | Sat, 14 May 2005 10:14:48 +0000 |
| parents | 5fed6f245cc3 |
| children | ef08f018389c |
| files | configure |
| diffstat | 1 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat May 14 10:05:09 2005 +0000 +++ b/configure Sat May 14 10:14:48 2005 +0000 @@ -1549,6 +1549,7 @@ --disable-internal-faad) _faad_internal=no ;; --enable-external-faad) _faad_external=yes _faad_internal=no ;; --disable-external-faad) _faad_external=no ;; + --enable-faac) _faac=yes ;; --disable-faac) _faac=no ;; --enable-ladspa) _ladspa=yes ;; --disable-ladspa) _ladspa=no ;; @@ -5420,20 +5421,17 @@ EOF if ( cc_check -c -O4 -lfaac $_ld_lm ); then _faac=yes - _ld_faac="-lfaac" + elif ( cc_check -c -O4 -lfaac -lmp4v2 -lstdc++ $_ld_lm ); then + _faac=yes + _ld_faac="-lmp4v2 -lstdc++" else - if ( cc_check -c -O4 -lfaac -lmp4v2 -lstdc++ $_ld_lm ); then - _faac=yes - _ld_faac="-lfaac -lmp4v2 -lstdc++" - else - _faac=no - _ld_faac="" - fi + _faac=no fi fi if test "$_faac" = yes ; then _def_faac="#define HAVE_FAAC 1" _codecmodules="$_codecmodules faac" + _ld_faac="-lfaac $_ld_faac" else _def_faac="#undef HAVE_FAAC" _nocodecmodules="$_nocodecmodules faac"