Mercurial > mplayer.hg

comparison configure @ 18739:13664a5039c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify and streamline FAAD detection.
author diego
date Sat, 17 Jun 2006 17:08:06 +0000
parents 6a99893397e9
children f6396989d394
comparison
equal deleted inserted replaced
18738:6a99893397e9 18739:13664a5039c7
1825 --disable-libdts) _libdts=no ;; 1825 --disable-libdts) _libdts=no ;;
1826 --enable-libmpeg2) _libmpeg2=yes ;; 1826 --enable-libmpeg2) _libmpeg2=yes ;;
1827 --disable-libmpeg2) _libmpeg2=no ;; 1827 --disable-libmpeg2) _libmpeg2=no ;;
1828 --enable-musepack) _musepack=yes ;; 1828 --enable-musepack) _musepack=yes ;;
1829 --disable-musepack) _musepack=no ;; 1829 --disable-musepack) _musepack=no ;;
1830 --enable-faad-internal) _faad_internal=yes _faad_external=no ;; 1830 --enable-faad-internal) _faad_internal=yes ;;
1831 --disable-faad-internal) _faad_internal=no ;; 1831 --disable-faad-internal) _faad_internal=no ;;
1832 --enable-faad-external) _faad_external=yes _faad_internal=no ;; 1832 --enable-faad-external) _faad_external=yes ;;
1833 --disable-faad-external) _faad_external=no ;; 1833 --disable-faad-external) _faad_external=no ;;
1834 --enable-faac) _faac=yes ;; 1834 --enable-faac) _faac=yes ;;
1835 --disable-faac) _faac=no ;; 1835 --disable-faac) _faac=no ;;
1836 --enable-ladspa) _ladspa=yes ;; 1836 --enable-ladspa) _ladspa=yes ;;
1837 --disable-ladspa) _ladspa=no ;; 1837 --disable-ladspa) _ladspa=no ;;
5792 _def_faac="#undef HAVE_FAAC" 5792 _def_faac="#undef HAVE_FAAC"
5793 _nocodecmodules="faac $_nocodecmodules" 5793 _nocodecmodules="faac $_nocodecmodules"
5794 fi 5794 fi
5795 echores "$_faac" 5795 echores "$_faac"
5796 5796
5797 echocheck "internal FAAD2 (AAC) support" 5797
5798 echocheck "FAAD2 (AAC) support"
5798 if test "$_faad_internal" = auto ; then 5799 if test "$_faad_internal" = auto ; then
5799 if x86 && test cc_vendor=gnu; then 5800 if x86 && test cc_vendor=gnu; then
5800 case $cc_version in 5801 case $cc_version in
5801 3.1*|3.2) # ICE/insn with these versions 5802 3.1*|3.2) # ICE/insn with these versions
5802 _faad_internal=no 5803 _faad_internal=no
5807 ;; 5808 ;;
5808 esac 5809 esac
5809 else 5810 else
5810 _faad_internal=yes 5811 _faad_internal=yes
5811 fi 5812 fi
5812 fi 5813 elif test "$_faad_external" = auto ; then
5813 if test "$_faad_internal" = yes ; then
5814 _def_faad_internal="#define USE_INTERNAL_FAAD 1"
5815 _faad_external=no
5816 else
5817 _def_faad_internal="#undef USE_INTERNAL_FAAD"
5818 _inc_faad=
5819 fi
5820 echores "$_faad_internal"
5821
5822
5823 echocheck "external FAAD2 (AAC) support"
5824 if test "$_faad_external" != no ; then
5825 _ld_faad='-lfaad' 5814 _ld_faad='-lfaad'
5826 _inc_faad="$_inc_extra" 5815 _inc_faad="$_inc_extra"
5827 # external faad: check if it's really faad2 :) 5816 # external faad: check if it's really faad2 :)
5828 if test "$_faad_external" = auto ; then 5817 if test "$_faad_external" = auto ; then
5829 _faad_external=no 5818 _faad_external=no
5835 int main(void) { faacDecHandle testhand; faacDecFrameInfo testinfo; testhand = faacDecOpen(); faacDecInit(0, 0, 0, 0, 0); return 0; } 5824 int main(void) { faacDecHandle testhand; faacDecFrameInfo testinfo; testhand = faacDecOpen(); faacDecInit(0, 0, 0, 0, 0); return 0; }
5836 EOF 5825 EOF
5837 cc_check $_inc_faad $_ld_faad $_ld_lm && _faad_external=yes 5826 cc_check $_inc_faad $_ld_faad $_ld_lm && _faad_external=yes
5838 fi 5827 fi
5839 fi 5828 fi
5840 echores "$_faad_external" 5829
5841 5830 if test "$_faad_internal" = yes ; then
5842 if test "$_faad_external" = yes; then 5831 _def_faad_internal="#define USE_INTERNAL_FAAD 1"
5832 _faad=yes
5833 elif test "$_faad_external" = yes ; then
5834 _faad=yes
5835 else
5836 _def_faad_internal="#undef USE_INTERNAL_FAAD"
5837 _faad=no
5838 fi
5839
5840 if test "$_faad" = yes ; then
5843 _def_faad='#define HAVE_FAAD 1' 5841 _def_faad='#define HAVE_FAAD 1'
5844 _codecmodules="faad2(external) $_codecmodules" 5842 _codecmodules="faad2 $_codecmodules"
5845 elif test "$_faad_internal" = yes; then
5846 _def_faad='#define HAVE_FAAD 1'
5847 _codecmodules="faad2(internal) $_codecmodules"
5848 else 5843 else
5849 _def_faad='#undef HAVE_FAAD' 5844 _def_faad='#undef HAVE_FAAD'
5850 _nocodecmodules="faad2 $_nocodecmodules" 5845 _nocodecmodules="faad2 $_nocodecmodules"
5851 _ld_faad= 5846 _ld_faad=
5852 fi 5847 _inc_faad=
5848 fi
5849 echores "$_faad"
5853 5850
5854 5851
5855 echocheck "LADSPA plugin support" 5852 echocheck "LADSPA plugin support"
5856 if test "$_ladspa" = auto ; then 5853 if test "$_ladspa" = auto ; then
5857 cat > $TMPC <<EOF 5854 cat > $TMPC <<EOF
7402 MP3LIB = $_mp3lib 7399 MP3LIB = $_mp3lib
7403 LIBA52 = $_liba52 7400 LIBA52 = $_liba52
7404 LIBMPEG2 = $_libmpeg2 7401 LIBMPEG2 = $_libmpeg2
7405 TREMOR = $_tremor_internal 7402 TREMOR = $_tremor_internal
7406 TREMOR_FLAGS = $_tremor_flags 7403 TREMOR_FLAGS = $_tremor_flags
7404 FAAD = $_faad
7407 7405
7408 SPEEX = $_speex 7406 SPEEX = $_speex
7409 MUSEPACK = $_musepack 7407 MUSEPACK = $_musepack
7410 7408
7411 UNRARLIB = $_unrarlib 7409 UNRARLIB = $_unrarlib