Mercurial > mplayer.hg

comparison configure @ 16459:2866304d5f4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
echores cleanup, introduce _res_comment variable to easily output additional information.
author reimar
date Mon, 12 Sep 2005 10:05:06 +0000
parents 4ca10b94b629
children d2a47e40462f
comparison
equal deleted inserted replaced
16458:c35ed5cdf07e 16459:2866304d5f4b
123 echo ${_echo_n} "Checking for $@ ... ${_echo_c}" 123 echo ${_echo_n} "Checking for $@ ... ${_echo_c}"
124 } 124 }
125 125
126 # Use this to echo the results of a check 126 # Use this to echo the results of a check
127 echores() { 127 echores() {
128 echo "Result is: $@ $_comment" >> "$TMPLOG" 128 if test "$_res_comment" ; then
129 _res_comment="($_res_comment)"
130 fi
131 echo "Result is: $@ $_res_comment" >> "$TMPLOG"
129 echo "##########################################" >> "$TMPLOG" 132 echo "##########################################" >> "$TMPLOG"
130 echo "" >> "$TMPLOG" 133 echo "" >> "$TMPLOG"
131 echo "$@ $_comment" 134 echo "$@ $_res_comment"
132 _comment="" 135 _res_comment=""
133 } 136 }
134 ############################################################################# 137 #############################################################################
135 138
136 # Check how echo works in this /bin/sh 139 # Check how echo works in this /bin/sh
137 case `echo -n` in 140 case `echo -n` in
2267 if test "$_i18n" = yes ; then 2270 if test "$_i18n" = yes ; then
2268 _def_i18n='#define USE_I18N 1' 2271 _def_i18n='#define USE_I18N 1'
2269 else 2272 else
2270 _def_i18n='#undef USE_I18N' 2273 _def_i18n='#undef USE_I18N'
2271 fi 2274 fi
2272 if test -z "$_i18n_libs" ; then 2275 if test "$_i18n_libs" ; then
2273 echores "$_i18n" 2276 _res_comment="using $_i18n_libs"
2274 else 2277 fi
2275 echores "$_i18n (using $_i18n_libs)" 2278 echores "$_i18n"
2276 fi
2277 2279
2278 2280
2279 echocheck "langinfo" 2281 echocheck "langinfo"
2280 if test "$_langinfo" = auto ; then 2282 if test "$_langinfo" = auto ; then
2281 cat > $TMPC <<EOF 2283 cat > $TMPC <<EOF
3006 cc_check -ltermcap && _termcap=yes && _ld_termcap='-ltermcap' 3008 cc_check -ltermcap && _termcap=yes && _ld_termcap='-ltermcap'
3007 cc_check -ltinfo && _termcap=yes && _ld_termcap='-ltinfo' 3009 cc_check -ltinfo && _termcap=yes && _ld_termcap='-ltinfo'
3008 fi 3010 fi
3009 if test "$_termcap" = yes ; then 3011 if test "$_termcap" = yes ; then
3010 _def_termcap='#define USE_TERMCAP 1' 3012 _def_termcap='#define USE_TERMCAP 1'
3011 echores "yes (using $_ld_termcap)" 3013 _res_comment="using $_ld_termcap"
3012 else 3014 else
3013 _def_termcap='#undef USE_TERMCAP' 3015 _def_termcap='#undef USE_TERMCAP'
3014 echores no 3016 fi
3015 fi 3017 echores "$_termcap"
3016 3018
3017 3019
3018 echocheck "termios" 3020 echocheck "termios"
3019 if test "$_termios" = auto ; then 3021 if test "$_termios" = auto ; then
3020 cat > $TMPC <<EOF 3022 cat > $TMPC <<EOF
3044 if test "$_def_termios_h_name" = 'sys/termios.h' ; then 3046 if test "$_def_termios_h_name" = 'sys/termios.h' ; then
3045 _def_termios_sys_h='#define HAVE_SYS_TERMIOS_H 1' 3047 _def_termios_sys_h='#define HAVE_SYS_TERMIOS_H 1'
3046 elif test "$_def_termios_h_name" = 'termios.h' ; then 3048 elif test "$_def_termios_h_name" = 'termios.h' ; then
3047 _def_termios_h='#define HAVE_TERMIOS_H 1' 3049 _def_termios_h='#define HAVE_TERMIOS_H 1'
3048 fi 3050 fi
3049 echores "yes (using $_def_termios_h_name)" 3051 _res_comment="using $_def_termios_h_name"
3050 else 3052 else
3051 _def_termios='#undef HAVE_TERMIOS' 3053 _def_termios='#undef HAVE_TERMIOS'
3052 _def_termios_h_name='' 3054 _def_termios_h_name=''
3053 echores "no" 3055 _termios=no
3054 fi 3056 fi
3057 echores "$_termios"
3055 3058
3056 3059
3057 echocheck "shm" 3060 echocheck "shm"
3058 if test "$_shm" = auto ; then 3061 if test "$_shm" = auto ; then
3059 cat > $TMPC << EOF 3062 cat > $TMPC << EOF
3479 EOF 3482 EOF
3480 if cc_check $_inc_directfb -ldirectfb && "$TMPO" >> "$TMPLOG" ; then 3483 if cc_check $_inc_directfb -ldirectfb && "$TMPO" >> "$TMPLOG" ; then
3481 _directfb_version=`"$TMPO"` 3484 _directfb_version=`"$TMPO"`
3482 _def_directfb_version="#define DIRECTFBVERSION $_directfb_version" 3485 _def_directfb_version="#define DIRECTFBVERSION $_directfb_version"
3483 if test "$_directfb_version" -ge 913; then 3486 if test "$_directfb_version" -ge 913; then
3484 echores "yes ($_directfb_version)" 3487 _res_comment="$_directfb_version"
3485 else 3488 else
3486 _def_directfb_version='#undef DIRECTFBVERSION' 3489 _def_directfb_version='#undef DIRECTFBVERSION'
3487 _directfb=no 3490 _directfb=no
3488 echores "no (version >=0.9.13 required)" 3491 _res_comment="version >=0.9.13 required"
3489 fi 3492 fi
3490 else 3493 else
3491 _directfb=no 3494 _directfb=no
3492 echores "no (failed to get version)" 3495 _res_comment="failed to get version"
3493 fi 3496 fi
3494 else 3497 fi
3495 echores "$_directfb" 3498 echores "$_directfb"
3496 fi
3497 3499
3498 if test "$_directfb" = yes ; then 3500 if test "$_directfb" = yes ; then
3499 _def_directfb='#define HAVE_DIRECTFB 1' 3501 _def_directfb='#define HAVE_DIRECTFB 1'
3500 if test "$_directfb_version" -ge 913; then 3502 if test "$_directfb_version" -ge 913; then
3501 _vosrc="$_vosrc vo_directfb2.c" 3503 _vosrc="$_vosrc vo_directfb2.c"
3558 fi 3560 fi
3559 if test "$_x11" = yes ; then 3561 if test "$_x11" = yes ; then
3560 _def_x11='#define HAVE_X11 1' 3562 _def_x11='#define HAVE_X11 1'
3561 _vosrc="$_vosrc x11_common.c vo_x11.c vo_xover.c" 3563 _vosrc="$_vosrc x11_common.c vo_x11.c vo_xover.c"
3562 _vomodules="x11 xover $_vomodules" 3564 _vomodules="x11 xover $_vomodules"
3563 echores "yes (using $I)" 3565 _res_comment="using $I"
3564 else 3566 else
3565 _x11=no 3567 _x11=no
3566 _def_x11='#undef HAVE_X11' 3568 _def_x11='#undef HAVE_X11'
3567 _inc_x11='' 3569 _inc_x11=''
3568 _ld_x11='' 3570 _ld_x11=''
3569 _novomodules="x11 $_novomodules" 3571 _novomodules="x11 $_novomodules"
3570 echores "no (check if the dev(el) packages are installed)" 3572 _res_comment="check if the dev(el) packages are installed"
3571 fi 3573 fi
3574 echores "$_x11"
3572 3575
3573 3576
3574 echocheck "DPMS" 3577 echocheck "DPMS"
3575 _xdpms3=no 3578 _xdpms3=no
3576 if test "$_x11" = yes ; then 3579 if test "$_x11" = yes ; then
3801 _def_gl='#define HAVE_GL 1' 3804 _def_gl='#define HAVE_GL 1'
3802 _vosrc="$_vosrc vo_gl.c vo_gl2.c gl_common.c" 3805 _vosrc="$_vosrc vo_gl.c vo_gl2.c gl_common.c"
3803 if test "$_gl_win32" = yes ; then 3806 if test "$_gl_win32" = yes ; then
3804 _def_gl_win32='#define GL_WIN32 1' 3807 _def_gl_win32='#define GL_WIN32 1'
3805 _vosrc="$_vosrc w32_common.c" 3808 _vosrc="$_vosrc w32_common.c"
3809 _res_comment="win32 version"
3806 fi 3810 fi
3807 _vomodules="opengl $_vomodules" 3811 _vomodules="opengl $_vomodules"
3808 else 3812 else
3809 _def_gl='#undef HAVE_GL' 3813 _def_gl='#undef HAVE_GL'
3810 _def_gl_win32='#undef GL_WIN32' 3814 _def_gl_win32='#undef GL_WIN32'
4016 #include <ost/audio.h> 4020 #include <ost/audio.h>
4017 int main(void) {return 0;} 4021 int main(void) {return 0;}
4018 EOF 4022 EOF
4019 if cc_check ; then 4023 if cc_check ; then
4020 _dvb=yes 4024 _dvb=yes
4021 echores "yes"
4022 else 4025 else
4023 for I in "$_inc_dvb" "-I/usr/src/DVB/ost/include" ; do 4026 for I in "$_inc_dvb" "-I/usr/src/DVB/ost/include" ; do
4024 if cc_check "$I" ; then 4027 if cc_check "$I" ; then
4025 _dvb=yes 4028 _dvb=yes
4026 _inc_dvb="$I" 4029 _inc_dvb="$I"
4027 echores "yes (using $_inc_dvb)" 4030 _res_comment="using $_inc_dvb"
4028 break 4031 break
4029 fi 4032 fi
4030 done 4033 done
4031 test "$_dvb" = no && echores "no (specify path to DVB/ost/include with --with-dvbincdir=DIR)" 4034 test "$_dvb" = no && _res_comment="specify path to DVB/ost/include with --with-dvbincdir=DIR"
4032 fi 4035 fi
4033 else 4036 fi
4034 echores "no" 4037 echores "$_dvb"
4035 fi
4036 if test "$_dvb" = yes ; then 4038 if test "$_dvb" = yes ; then
4037 _def_dvb='#define HAVE_DVB 1' 4039 _def_dvb='#define HAVE_DVB 1'
4038 _def_dvb_in='#define HAS_DVBIN_SUPPORT 1' 4040 _def_dvb_in='#define HAS_DVBIN_SUPPORT 1'
4039 _aomodules="mpegpes(dvb) $_aomodules" 4041 _aomodules="mpegpes(dvb) $_aomodules"
4040 _vomodules="mpegpes(dvb) $_vomodules" 4042 _vomodules="mpegpes(dvb) $_vomodules"
4057 #include <linux/dvb/audio.h> 4059 #include <linux/dvb/audio.h>
4058 int main(void) {return 0;} 4060 int main(void) {return 0;}
4059 EOF 4061 EOF
4060 if cc_check ; then 4062 if cc_check ; then
4061 _dvbhead=yes 4063 _dvbhead=yes
4062 echores "yes"
4063 else 4064 else
4064 for I in "$_inc_dvb" "-I/usr/src/DVB/include" ; do 4065 for I in "$_inc_dvb" "-I/usr/src/DVB/include" ; do
4065 if cc_check "$I" ; then 4066 if cc_check "$I" ; then
4066 _dvbhead=yes 4067 _dvbhead=yes
4067 _inc_dvb="$I" 4068 _inc_dvb="$I"
4068 echores "yes (using $_inc_dvb)" 4069 _res_comment="using $_inc_dvb"
4069 break 4070 break
4070 fi 4071 fi
4071 done 4072 done
4072 test "$_dvbhead" = no && echores "no (specify path to DVB/include (HEAD Version) with --with-dvbincdir=DIR)" 4073 test "$_dvbhead" = no && _res_comment="specify path to DVB/include (HEAD Version) with --with-dvbincdir=DIR"
4073 fi 4074 fi
4074 else 4075 fi
4075 echores "no" 4076 echores "$_dvbhead"
4076 fi
4077 if test "$_dvbhead" = yes ; then 4077 if test "$_dvbhead" = yes ; then
4078 _def_dvb='#define HAVE_DVB_HEAD 1' 4078 _def_dvb='#define HAVE_DVB_HEAD 1'
4079 _def_dvb_in='#define HAS_DVBIN_SUPPORT 1' 4079 _def_dvb_in='#define HAS_DVBIN_SUPPORT 1'
4080 _aomodules="mpegpes(dvb) $_aomodules" 4080 _aomodules="mpegpes(dvb) $_aomodules"
4081 _vomodules="mpegpes(dvb) $_vomodules" 4081 _vomodules="mpegpes(dvb) $_vomodules"
4100 if test "$_png" = auto ; then 4100 if test "$_png" = auto ; then
4101 _png=no 4101 _png=no
4102 if irix ; then 4102 if irix ; then
4103 # Don't check for -lpng on irix since it has its own libpng 4103 # Don't check for -lpng on irix since it has its own libpng
4104 # incompatible with the GNU libpng 4104 # incompatible with the GNU libpng
4105 echores "disabled on irix (not GNU libpng)" 4105 _res_comment="disabled on irix (not GNU libpng)"
4106 else 4106 else
4107 cat > $TMPC << EOF 4107 cat > $TMPC << EOF
4108 #include <png.h> 4108 #include <png.h>
4109 #include <string.h> 4109 #include <string.h>
4110 int main(void) { 4110 int main(void) {
4114 } 4114 }
4115 EOF 4115 EOF
4116 if cc_check -lpng -lz $_ld_lm ; then 4116 if cc_check -lpng -lz $_ld_lm ; then
4117 if "$TMPO" >> "$TMPLOG" ; then 4117 if "$TMPO" >> "$TMPLOG" ; then
4118 _png=yes 4118 _png=yes
4119 echores yes
4120 else 4119 else
4121 echores "no (mismatch of library and header versions)" 4120 _res_comment="mismatch of library and header versions"
4122 fi 4121 fi
4123 else
4124 echores no
4125 fi 4122 fi
4126 fi 4123 fi
4127 else 4124 fi
4128 echores "$_png" 4125 echores "$_png"
4129 fi
4130 if test "$_png" = yes ; then 4126 if test "$_png" = yes ; then
4131 _def_png='#define HAVE_PNG 1' 4127 _def_png='#define HAVE_PNG 1'
4132 _ld_png='-lpng -lz' 4128 _ld_png='-lpng -lz'
4133 _vosrc="$_vosrc vo_png.c" 4129 _vosrc="$_vosrc vo_png.c"
4134 _vomodules="png $_vomodules" 4130 _vomodules="png $_vomodules"
4314 if test "$_vesa" = yes ; then 4310 if test "$_vesa" = yes ; then
4315 _def_vesa='#define HAVE_VESA 1' 4311 _def_vesa='#define HAVE_VESA 1'
4316 _ld_vesa="-lvbe -llrmi" 4312 _ld_vesa="-lvbe -llrmi"
4317 _vosrc="$_vosrc vo_vesa.c vesa_lvo.c gtf.c" 4313 _vosrc="$_vosrc vo_vesa.c vesa_lvo.c gtf.c"
4318 _vomodules="vesa $_vomodules" 4314 _vomodules="vesa $_vomodules"
4319 echores "yes"
4320 else 4315 else
4321 _def_vesa='#undef HAVE_VESA' 4316 _def_vesa='#undef HAVE_VESA'
4322 echores "no"
4323 _novomodules="vesa $_novomodules" 4317 _novomodules="vesa $_novomodules"
4324 fi 4318 fi
4319 echores "$_vesa"
4325 4320
4326 ################# 4321 #################
4327 # VIDEO + AUDIO # 4322 # VIDEO + AUDIO #
4328 ################# 4323 #################
4329 4324
4353 else 4348 else
4354 _def_sdlbuggy='#undef BUGGY_SDL' 4349 _def_sdlbuggy='#undef BUGGY_SDL'
4355 fi 4350 fi
4356 _sdl=yes 4351 _sdl=yes
4357 else 4352 else
4358 _sdl=outdated 4353 _res_comment=outdated
4359 fi 4354 fi
4360 fi 4355 fi
4361 fi 4356 fi
4362 fi 4357 fi
4363 if test "$_sdl" = yes ; then 4358 if test "$_sdl" = yes ; then
4374 fi 4369 fi
4375 _vosrc="$_vosrc vo_sdl.c" 4370 _vosrc="$_vosrc vo_sdl.c"
4376 _vomodules="sdl $_vomodules" 4371 _vomodules="sdl $_vomodules"
4377 _aosrc="$_aosrc ao_sdl.c" 4372 _aosrc="$_aosrc ao_sdl.c"
4378 _aomodules="sdl $_aomodules" 4373 _aomodules="sdl $_aomodules"
4379 echores "yes (using $_sdlconfig)" 4374 _res_comment="using $_sdlconfig"
4380 else 4375 else
4381 _def_sdl='#undef HAVE_SDL' 4376 _def_sdl='#undef HAVE_SDL'
4382 _novomodules="sdl $_novomodules" 4377 _novomodules="sdl $_novomodules"
4383 _noaomodules="sdl $_noaomodules" 4378 _noaomodules="sdl $_noaomodules"
4384 echores "no" 4379 fi
4385 fi 4380 echores "$_sdl"
4386 4381
4387 echocheck "Windows waveout" 4382 echocheck "Windows waveout"
4388 if test "$_win32waveout" = auto ; then 4383 if test "$_win32waveout" = auto ; then
4389 cat > $TMPC << EOF 4384 cat > $TMPC << EOF
4390 #include <windows.h> 4385 #include <windows.h>
4467 _def_dxr2='#define HAVE_DXR2 1' 4462 _def_dxr2='#define HAVE_DXR2 1'
4468 _vosrc="$_vosrc vo_dxr2.c" 4463 _vosrc="$_vosrc vo_dxr2.c"
4469 _aosrc="$_aosrc ao_dxr2.c" 4464 _aosrc="$_aosrc ao_dxr2.c"
4470 _aomodules="dxr2 $_aomodules" 4465 _aomodules="dxr2 $_aomodules"
4471 _vomodules="dxr2 $_vomodules" 4466 _vomodules="dxr2 $_vomodules"
4472 echores "yes (using $_inc_dxr2)" 4467 _res_comment="using $_inc_dxr2"
4473 else 4468 else
4474 _def_dxr2='#undef HAVE_DXR2' 4469 _def_dxr2='#undef HAVE_DXR2'
4475 _noaomodules="dxr2 $_noaomodules" 4470 _noaomodules="dxr2 $_noaomodules"
4476 _novomodules="dxr2 $_novomodules" 4471 _novomodules="dxr2 $_novomodules"
4477 _inc_dxr2="" 4472 _inc_dxr2=""
4478 echores "no" 4473 fi
4479 fi 4474 echores "$_dxr2"
4480 4475
4481 echocheck "DXR3/H+" 4476 echocheck "DXR3/H+"
4482 if test "$_dxr3" = auto ; then 4477 if test "$_dxr3" = auto ; then
4483 cat > $TMPC << EOF 4478 cat > $TMPC << EOF
4484 #include <linux/em8300.h> 4479 #include <linux/em8300.h>
4530 if test "$_fame" = auto ; then 4525 if test "$_fame" = auto ; then
4531 _fame=no 4526 _fame=no
4532 if test -d libfame && test -f libfame/fame.h ; then 4527 if test -d libfame && test -f libfame/fame.h ; then
4533 # disable fame on cygwin as no sense to port - atmos 4528 # disable fame on cygwin as no sense to port - atmos
4534 cygwin || _fame=yes 4529 cygwin || _fame=yes
4535 echores $_fame
4536 else 4530 else
4537 echores "no (no fame dir)" 4531 _res_comment="no fame dir"
4538 fi 4532 fi
4539 else 4533 fi
4540 echores "$_fame" 4534 echores "$_fame"
4541 fi
4542 4535
4543 _def_fame='#undef USE_LIBFAME' 4536 _def_fame='#undef USE_LIBFAME'
4544 if test "$_fame" = yes ; then 4537 if test "$_fame" = yes ; then
4545 _def_fame='#define USE_LIBFAME 1' 4538 _def_fame='#define USE_LIBFAME 1'
4546 _ld_fame='libfame/libfame.a' 4539 _ld_fame='libfame/libfame.a'
4751 _def_alsa9='#undef HAVE_ALSA9' 4744 _def_alsa9='#undef HAVE_ALSA9'
4752 _def_alsa1x='#undef HAVE_ALSA1X' 4745 _def_alsa1x='#undef HAVE_ALSA1X'
4753 _def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' 4746 _def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H'
4754 _def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' 4747 _def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H'
4755 if test "$_alsaver" ; then 4748 if test "$_alsaver" ; then
4749 _alsa=yes
4756 if test "$_alsaver" = '0.5.x' ; then 4750 if test "$_alsaver" = '0.5.x' ; then
4757 _aosrc="$_aosrc ao_alsa5.c" 4751 _aosrc="$_aosrc ao_alsa5.c"
4758 _aomodules="alsa5 $_aomodules" 4752 _aomodules="alsa5 $_aomodules"
4759 _def_alsa5='#define HAVE_ALSA5 1' 4753 _def_alsa5='#define HAVE_ALSA5 1'
4760 _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' 4754 _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
4761 echores "yes (using alsa 0.5.x and sys/asoundlib.h)" 4755 _res_comment="using alsa 0.5.x and sys/asoundlib.h"
4762 elif test "$_alsaver" = '0.9.x-sys' ; then 4756 elif test "$_alsaver" = '0.9.x-sys' ; then
4763 _aosrc="$_aosrc ao_alsa.c" 4757 _aosrc="$_aosrc ao_alsa.c"
4764 _aomodules="alsa $_aomodules" 4758 _aomodules="alsa $_aomodules"
4765 _def_alsa9='#define HAVE_ALSA9 1' 4759 _def_alsa9='#define HAVE_ALSA9 1'
4766 _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' 4760 _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
4767 echores "yes (using alsa 0.9.x and sys/asoundlib.h)" 4761 _res_comment="using alsa 0.9.x and sys/asoundlib.h"
4768 elif test "$_alsaver" = '0.9.x-alsa' ; then 4762 elif test "$_alsaver" = '0.9.x-alsa' ; then
4769 _aosrc="$_aosrc ao_alsa.c" 4763 _aosrc="$_aosrc ao_alsa.c"
4770 _aomodules="alsa $_aomodules" 4764 _aomodules="alsa $_aomodules"
4771 _def_alsa9='#define HAVE_ALSA9 1' 4765 _def_alsa9='#define HAVE_ALSA9 1'
4772 _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' 4766 _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1'
4773 echores "yes (using alsa 0.9.x and alsa/asoundlib.h)" 4767 _res_comment="using alsa 0.9.x and alsa/asoundlib.h"
4774 elif test "$_alsaver" = '1.0.x-sys' ; then 4768 elif test "$_alsaver" = '1.0.x-sys' ; then
4775 _aosrc="$_aosrc ao_alsa.c" 4769 _aosrc="$_aosrc ao_alsa.c"
4776 _aomodules="alsa $_aomodules" 4770 _aomodules="alsa $_aomodules"
4777 _def_alsa1x="#define HAVE_ALSA1X 1" 4771 _def_alsa1x="#define HAVE_ALSA1X 1"
4778 _def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' 4772 _def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
4779 echores "yes (using alsa 1.0.x and sys/asoundlib.h)" 4773 _res_comment="using alsa 1.0.x and sys/asoundlib.h"
4780 elif test "$_alsaver" = '1.0.x-alsa' ; then 4774 elif test "$_alsaver" = '1.0.x-alsa' ; then
4781 _aosrc="$_aosrc ao_alsa.c" 4775 _aosrc="$_aosrc ao_alsa.c"
4782 _aomodules="alsa $_aomodules" 4776 _aomodules="alsa $_aomodules"
4783 _def_alsa1x="#define HAVE_ALSA1X 1" 4777 _def_alsa1x="#define HAVE_ALSA1X 1"
4784 _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' 4778 _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1'
4785 echores "yes (using alsa 1.0.x and alsa/asoundlib.h)" 4779 _res_comment="using alsa 1.0.x and alsa/asoundlib.h"
4780 else
4781 _alsa=no
4782 _res_comment="unknown version"
4786 fi 4783 fi
4787 _ld_alsa="-lasound $_ld_dl $_ld_pthread" 4784 _ld_alsa="-lasound $_ld_dl $_ld_pthread"
4788 else 4785 else
4789 _noaomodules="alsa $_noaomodules" 4786 _noaomodules="alsa $_noaomodules"
4790 echores "no" 4787 fi
4791 fi 4788 echores "$_alsa"
4792 4789
4793 4790
4794 echocheck "Sun audio" 4791 echocheck "Sun audio"
4795 if test "$_sunaudio" = auto ; then 4792 if test "$_sunaudio" = auto ; then
4796 cat > $TMPC << EOF 4793 cat > $TMPC << EOF
5041 echocheck "freetype >= 2.0.9" 5038 echocheck "freetype >= 2.0.9"
5042 5039
5043 # freetype depends on iconv 5040 # freetype depends on iconv
5044 if test "$_iconv" = no ; then 5041 if test "$_iconv" = no ; then
5045 _freetype=no 5042 _freetype=no
5046 _comment="(iconv support needed)" 5043 _res_comment="iconv support needed"
5047 fi 5044 fi
5048 5045
5049 if test "$_freetype" = auto ; then 5046 if test "$_freetype" = auto ; then
5050 if ( $_freetypeconfig --version ) >/dev/null 2>&1 ; then 5047 if ( $_freetypeconfig --version ) >/dev/null 2>&1 ; then
5051 cat > $TMPC << EOF 5048 cat > $TMPC << EOF
5090 fi 5087 fi
5091 echores "$_freetype" 5088 echores "$_freetype"
5092 5089
5093 if test "$_freetype" = no ; then 5090 if test "$_freetype" = no ; then
5094 _fontconfig=no 5091 _fontconfig=no
5095 _comment="(freetype support needed)" 5092 _res_comment="freetype support needed"
5096 fi 5093 fi
5097 echocheck "fontconfig" 5094 echocheck "fontconfig"
5098 if test "$_fontconfig" = auto ; then 5095 if test "$_fontconfig" = auto ; then
5099 if ( pkg-config --modversion fontconfig) > /dev/null 2>&1 ; then 5096 if ( pkg-config --modversion fontconfig) > /dev/null 2>&1 ; then
5100 cat > $TMPC << EOF 5097 cat > $TMPC << EOF
5281 else 5278 else
5282 _def_toolame='#undef HAVE_TOOLAME' 5279 _def_toolame='#undef HAVE_TOOLAME'
5283 _toolame_lib="" 5280 _toolame_lib=""
5284 _nocodecmodules="toolame $_nocodecmodules" 5281 _nocodecmodules="toolame $_nocodecmodules"
5285 fi 5282 fi
5286 if test -z "$_toolamedir" ; then 5283 if test "$_toolamedir" ; then
5287 echores "$_toolame" 5284 _res_comment="using $_toolamedir"
5288 else 5285 fi
5289 echores "$_toolame (using $_toolamedir)" 5286 echores "$_toolame"
5290 fi
5291 5287
5292 echocheck "Twolame" 5288 echocheck "Twolame"
5293 if test "$_twolame" = auto ; then 5289 if test "$_twolame" = auto ; then
5294 cat > $TMPC <<EOF 5290 cat > $TMPC <<EOF
5295 #include <twolame.h> 5291 #include <twolame.h>
5345 _def_vorbis='#undef HAVE_OGGVORBIS' 5341 _def_vorbis='#undef HAVE_OGGVORBIS'
5346 _def_tremor='#undef TREMOR' 5342 _def_tremor='#undef TREMOR'
5347 _nocodecmodules="libvorbis $_nocodecmodules" 5343 _nocodecmodules="libvorbis $_nocodecmodules"
5348 fi 5344 fi
5349 if test "$_vorbis" = yes -a "$_tremor_internal" = yes -a "$_tremor_low" = yes ; then 5345 if test "$_vorbis" = yes -a "$_tremor_internal" = yes -a "$_tremor_low" = yes ; then
5350 echores "$_vorbis (internal low accuracy Tremor)" 5346 _res_comment="internal low accuracy Tremor"
5351 elif test "$_vorbis" = yes -a "$_tremor_internal" = yes ; then 5347 elif test "$_vorbis" = yes -a "$_tremor_internal" = yes ; then
5352 echores "$_vorbis (internal Tremor)" 5348 _res_comment="internal Tremor"
5353 elif test "$_vorbis" = yes -a "$_tremor" = yes ; then 5349 elif test "$_vorbis" = yes -a "$_tremor" = yes ; then
5354 echores "$_vorbis (Tremor)" 5350 _res_comment="Tremor"
5355 else 5351 fi
5356 echores "$_vorbis" 5352 echores "$_vorbis"
5357 fi
5358 5353
5359 echocheck "OggTheora support (only the CVS version!)" 5354 echocheck "OggTheora support (only the CVS version!)"
5360 if test "$_theora" = auto ; then 5355 if test "$_theora" = auto ; then
5361 _theora=no 5356 _theora=no
5362 cat > $TMPC << EOF 5357 cat > $TMPC << EOF
5558 #endif 5553 #endif
5559 int main(void) { faacDecHandle testhand; faacDecFrameInfo testinfo; testhand = faacDecOpen(); faacDecInit(0, 0, 0, 0, 0); return 0; } 5554 int main(void) { faacDecHandle testhand; faacDecFrameInfo testinfo; testhand = faacDecOpen(); faacDecInit(0, 0, 0, 0, 0); return 0; }
5560 EOF 5555 EOF
5561 cc_check $_inc_faad $_ld_faad $_ld_lm && _faad_external=yes 5556 cc_check $_inc_faad $_ld_faad $_ld_lm && _faad_external=yes
5562 fi 5557 fi
5563 echores "$_faad_external" 5558 fi
5564 else 5559 echores "$_faad_external"
5565 echores "no"
5566 fi
5567 5560
5568 if test "$_faad_external" = yes; then 5561 if test "$_faad_external" = yes; then
5569 _def_faad='#define HAVE_FAAD 1' 5562 _def_faad='#define HAVE_FAAD 1'
5570 _codecmodules="faad2(external) $_codecmodules" 5563 _codecmodules="faad2(external) $_codecmodules"
5571 elif test "$_faad_internal" = yes; then 5564 elif test "$_faad_internal" = yes; then
5626 _win32=no 5619 _win32=no
5627 test -n "$_win32libdir" && _win32=yes 5620 test -n "$_win32libdir" && _win32=yes
5628 fi 5621 fi
5629 if test "$_win32" = yes ; then 5622 if test "$_win32" = yes ; then
5630 _def_win32='#define USE_WIN32DLL 1' 5623 _def_win32='#define USE_WIN32DLL 1'
5631 echores "yes (using $_win32libdir)" 5624 _res_comment="using $_win32libdir"
5632 else 5625 else
5633 _def_win32='#undef USE_WIN32DLL' 5626 _def_win32='#undef USE_WIN32DLL'
5634 _nocodecmodules="win32 $_nocodecmodules" 5627 _nocodecmodules="win32 $_nocodecmodules"
5635 _dshow=no 5628 _dshow=no
5636 echores "no" 5629 fi
5637 fi 5630 echores "$_win32"
5638 5631
5639 if test "$_win32" != no ; then 5632 if test "$_win32" != no ; then
5640 _def_win32_loader='#undef WIN32_LOADER' 5633 _def_win32_loader='#undef WIN32_LOADER'
5641 echocheck "Win32 loader support" 5634 echocheck "Win32 loader support"
5642 _ld_win32='loader/libloader.a' 5635 _ld_win32='loader/libloader.a'
5709 5702
5710 5703
5711 echocheck "XAnim DLL" 5704 echocheck "XAnim DLL"
5712 if test "$_xanim" = auto ; then 5705 if test "$_xanim" = auto ; then
5713 _xanim=no 5706 _xanim=no
5707 _res_comment="dynamic loader support needed"
5714 if test "$_dl" = yes ; then 5708 if test "$_dl" = yes ; then
5709 _res_comment="no suitable directory found - see DOCS/HTML/$_doc_lang/codecs.html"
5715 if test -z "$_xanimlibdir" ; then 5710 if test -z "$_xanimlibdir" ; then
5716 for I in "$_libdir/codecs" /usr/local/lib/xanim/mods /usr/lib/xanim/mods /usr/lib/xanim $XANIM_MOD_DIR ; do 5711 for I in "$_libdir/codecs" /usr/local/lib/xanim/mods /usr/lib/xanim/mods /usr/lib/xanim $XANIM_MOD_DIR ; do
5717 if test -d "$I" ; then 5712 if test -d "$I" ; then
5718 _xanimlibdir="$I" 5713 _xanimlibdir="$I"
5719 break; 5714 break;
5720 fi; 5715 fi;
5721 done 5716 done
5722 fi 5717 fi
5723 test "$_xanimlibdir" && _xanim=yes 5718 test "$_xanimlibdir" && _xanim=yes
5724 if test "$_xanim" = yes ; then 5719 fi
5725 echores "yes (using $_xanimlibdir)"
5726 else
5727 echores "no (no suitable directory found - see DOCS/HTML/$_doc_lang/codecs.html)"
5728 fi
5729 else
5730 echores "no (dynamic loader support needed)"
5731 fi
5732 else
5733 echores "$_xanim (using $_xanimlibdir)"
5734 fi 5720 fi
5735 if test "$_xanim" = yes ; then 5721 if test "$_xanim" = yes ; then
5736 _def_xanim='#define USE_XANIM 1' 5722 _def_xanim='#define USE_XANIM 1'
5737 _def_xanim_path="#define XACODEC_PATH \"$_xanimlibdir\"" 5723 _def_xanim_path="#define XACODEC_PATH \"$_xanimlibdir\""
5738 _codecmodules="xanim $_codecmodules" 5724 _codecmodules="xanim $_codecmodules"
5725 _res_comment="using $_xanimlibdir"
5739 else 5726 else
5740 _def_xanim='#undef USE_XANIM' 5727 _def_xanim='#undef USE_XANIM'
5741 _def_xanim_path='#undef XACODEC_PATH' 5728 _def_xanim_path='#undef XACODEC_PATH'
5742 _nocodecmodules="xanim $_nocodecmodules" 5729 _nocodecmodules="xanim $_nocodecmodules"
5743 fi 5730 fi
5731 echores "$_xanim"
5744 5732
5745 echocheck "RealPlayer DLL" 5733 echocheck "RealPlayer DLL"
5746 if test "$_real" = auto ; then 5734 if test "$_real" = auto ; then
5747 _real=no 5735 _real=no
5736 _res_comment="dynamic loader support needed"
5748 if test "$_dl" = yes || test "$_win32" = yes ; then 5737 if test "$_dl" = yes || test "$_win32" = yes ; then
5749 # if test "$_dl" = yes ; then 5738 # if test "$_dl" = yes ; then
5739 _res_comment="tested only on Linux/FreeBSD/NetBSD/Cygwin/MinGW/Darwin"
5750 if linux || freebsd || netbsd || win32 || darwin ; then 5740 if linux || freebsd || netbsd || win32 || darwin ; then
5751 _real=yes 5741 _res_comment="no suitable directory found - see DOCS/HTML/$_doc_lang/codecs.html"
5752 else
5753 echores "no (tested only on Linux/FreeBSD/NetBSD/Cygwin/MinGW/Darwin)"
5754 fi
5755 if test "$_real" = yes ; then
5756 if test -z "$_reallibdir" ; then 5742 if test -z "$_reallibdir" ; then
5757 for I in "$_libdir/codecs" "$_libdir/real" /usr/lib/real \ 5743 for I in "$_libdir/codecs" "$_libdir/real" /usr/lib/real \
5758 /usr/lib/RealPlayer{9,8,}/Codecs /usr/local/RealPlayer{9,8,}/Codecs \ 5744 /usr/lib/RealPlayer{9,8,}/Codecs /usr/local/RealPlayer{9,8,}/Codecs \
5759 /usr/local/lib/RealPlayer{9,8,}/Codecs /opt/RealPlayer{9,8,}/{Real/,}Codecs \ 5745 /usr/local/lib/RealPlayer{9,8,}/Codecs /opt/RealPlayer{9,8,}/{Real/,}Codecs \
5760 {~,}/Applications/RealOne\ Player.app/Contents/MacOS/Library/Codecs \ 5746 {~,}/Applications/RealOne\ Player.app/Contents/MacOS/Library/Codecs \
5763 _reallibdir="$I" 5749 _reallibdir="$I"
5764 break 5750 break
5765 fi 5751 fi
5766 done 5752 done
5767 fi 5753 fi
5768 test "$_reallibdir" || _real=no 5754 test "$_reallibdir" && _real=yes
5769 if test "$_real" = yes ; then
5770 echores "yes (using $_reallibdir)"
5771 else
5772 echores "no (no suitable directory found - see DOCS/HTML/$_doc_lang/codecs.html)"
5773 fi
5774 fi 5755 fi
5775 else 5756 fi
5776 echores "no (dynamic loader support needed)"
5777 fi
5778 else
5779 echores "$_real (using $_reallibdir)"
5780 fi 5757 fi
5781 if test "$_real" = yes ; then 5758 if test "$_real" = yes ; then
5782 _def_real='#define USE_REALCODECS 1' 5759 _def_real='#define USE_REALCODECS 1'
5783 _def_real_path="#define REALCODEC_PATH \"$_reallibdir\"" 5760 _def_real_path="#define REALCODEC_PATH \"$_reallibdir\""
5784 _codecmodules="real $_codecmodules" 5761 _codecmodules="real $_codecmodules"
5762 _res_comment="using $_reallibdir"
5785 else 5763 else
5786 _def_real='#undef USE_REALCODECS' 5764 _def_real='#undef USE_REALCODECS'
5787 _def_real_path="#undef REALCODEC_PATH" 5765 _def_real_path="#undef REALCODEC_PATH"
5788 _nocodecmodules="real $_nocodecmodules" 5766 _nocodecmodules="real $_nocodecmodules"
5789 fi 5767 fi
5768 echores "$_real"
5790 5769
5791 5770
5792 echocheck "LIVE.COM Streaming Media libraries" 5771 echocheck "LIVE.COM Streaming Media libraries"
5793 if test "$_live" = auto && test "$_network" = yes ; then 5772 if test "$_live" = auto && test "$_network" = yes ; then
5794 _TMPC=$TMPC 5773 _TMPC=$TMPC
5872 5851
5873 echocheck "FFmpeg libavcodec (static)" 5852 echocheck "FFmpeg libavcodec (static)"
5874 if test "$_libavcodec" = auto ; then 5853 if test "$_libavcodec" = auto ; then
5875 # Note: static linking is preferred to dynamic linking 5854 # Note: static linking is preferred to dynamic linking
5876 _libavcodec=no 5855 _libavcodec=no
5856 _res_comment="see DOCS/HTML/$_doc_lang/codecs.html"
5877 if test -d libavcodec && test -f libavcodec/utils.c ; then 5857 if test -d libavcodec && test -f libavcodec/utils.c ; then
5858 _res_comment="old ffmpeg version, use CVS !"
5878 if grep avcodec_find_encoder_by_name libavcodec/utils.c > /dev/null 2>&1 ; then 5859 if grep avcodec_find_encoder_by_name libavcodec/utils.c > /dev/null 2>&1 ; then
5879 # check if libavutil is a required 5860 # check if libavutil is a required
5880 cat > $TMPC << EOF 5861 cat > $TMPC << EOF
5881 #include "libavcodec/avcodec.h" 5862 #include "libavcodec/avcodec.h"
5882 #if LIBAVCODEC_BUILD >= 3211265 5863 #if LIBAVCODEC_BUILD >= 3211265
5888 if cc_check -I. -I./libavutil; then 5869 if cc_check -I. -I./libavutil; then
5889 _libavutil_required="no" 5870 _libavutil_required="no"
5890 else 5871 else
5891 _libavutil_required="yes" 5872 _libavutil_required="yes"
5892 fi 5873 fi
5893 if test "$_libavutil_required" != "$_libavutil"; then 5874 _res_comment="libavutil availability does not fit libavcodec version"
5894 _libavcodec="no (libavutil availability does not fit libavcodec version)" 5875 if test "$_libavutil_required" = "$_libavutil"; then
5895 else
5896 _libavcodec="yes" 5876 _libavcodec="yes"
5877 _res_comment=""
5897 fi 5878 fi
5898 echores $_libavcodec
5899 else
5900 echores "no (old ffmpeg version, use CVS !)"
5901 fi 5879 fi
5902 else 5880 fi
5903 echores "no (see DOCS/HTML/$_doc_lang/codecs.html)" 5881 fi
5904 fi 5882 echores "$_libavcodec"
5905 else
5906 echores "$_libavcodec"
5907 fi
5908 5883
5909 echocheck "FFmpeg libavformat (static)" 5884 echocheck "FFmpeg libavformat (static)"
5910 if test "$_libavformat" = auto ; then 5885 if test "$_libavformat" = auto ; then
5911 # Note: static linking is preferred to dynamic linking 5886 # Note: static linking is preferred to dynamic linking
5912 _libavformat=no 5887 _libavformat=no
5913 if test -d libavformat && test -f libavformat/utils.c ; then 5888 if test -d libavformat && test -f libavformat/utils.c ; then
5914 _libavformat=yes 5889 _libavformat=yes
5915 echores "yes" 5890 fi
5916 else 5891 fi
5917 echores "no" 5892 echores "$_libavformat"
5918 fi
5919 else
5920 echores "$_libavformat"
5921 fi
5922 5893
5923 _def_haveffpostprocess='no' 5894 _def_haveffpostprocess='no'
5924 if test -d libavcodec && test -f libavcodec/libpostproc/postprocess.h ; then 5895 if test -d libavcodec && test -f libavcodec/libpostproc/postprocess.h ; then
5925 _def_haveffpostprocess='yes' 5896 _def_haveffpostprocess='yes'
5926 fi 5897 fi
5927 5898
5928 if test "$_libavcodec" != yes ; then 5899 if test "$_libavcodec" != yes ; then
5929 echocheck "FFmpeg libavcodec (dynamic)" 5900 echocheck "FFmpeg libavcodec (dynamic)"
5930 if test "$_libavcodecso" = auto ; then 5901 if test "$_libavcodecso" = auto ; then
5931 _libavcodecso=no 5902 _libavcodecso=no
5903 _res_comment="libavcodec.so is broken/obsolete"
5932 # FIXME : check for avcodec_find_encoder_by_name() for mencoder 5904 # FIXME : check for avcodec_find_encoder_by_name() for mencoder
5933 cat > $TMPC << EOF 5905 cat > $TMPC << EOF
5934 #define FF_POSTPROCESS 1 5906 #define FF_POSTPROCESS 1
5935 #include <ffmpeg/avcodec.h> 5907 #include <ffmpeg/avcodec.h>
5936 int main(void) { 5908 int main(void) {
5938 return 0; 5910 return 0;
5939 } 5911 }
5940 EOF 5912 EOF
5941 if cc_check -lavcodec $_ld_lm ; then 5913 if cc_check -lavcodec $_ld_lm ; then
5942 _libavcodecso=yes 5914 _libavcodecso=yes
5943 echores "yes (using libavcodec.so)" 5915 _res_comment="using libavcodec.so, but static libavcodec is recommended"
5944 else 5916 fi
5945 echores "no (libavcodec.so is broken/obsolete)" 5917 fi
5946 fi 5918 echores "$_libavcodecso"
5947 else
5948 echores "$_libavcodecso"
5949 fi
5950 fi 5919 fi
5951 5920
5952 _def_libavcodec='#undef USE_LIBAVCODEC' 5921 _def_libavcodec='#undef USE_LIBAVCODEC'
5953 _def_libavcodecso='#undef USE_LIBAVCODEC_SO' 5922 _def_libavcodecso='#undef USE_LIBAVCODEC_SO'
5954 _def_ffpostprocess='#undef FF_POSTPROCESS' 5923 _def_ffpostprocess='#undef FF_POSTPROCESS'
5981 _def_libavformat_win32='#define CONFIG_WIN32 1' 5950 _def_libavformat_win32='#define CONFIG_WIN32 1'
5982 fi 5951 fi
5983 fi 5952 fi
5984 5953
5985 echocheck "amr narrowband" 5954 echocheck "amr narrowband"
5986 _echomsg=""
5987 if test "$_amr_nb" = auto ; then 5955 if test "$_amr_nb" = auto ; then
5956 _amr_nb=no
5988 if test -f libavcodec/amr_float/sp_dec.c ; then 5957 if test -f libavcodec/amr_float/sp_dec.c ; then
5989 if test "$_libavcodec" = yes ; then 5958 if test "$_libavcodec" = yes ; then
5990 _amr_nb=yes 5959 _amr_nb=yes
5991 else 5960 else
5992 _amr_nb=no 5961 _res_comment="libavcodec (static) is required by amr_nb, sorry"
5993 _echomsg "libavcodec (static) is required by amr_nb, sorry"
5994 fi 5962 fi
5995 else
5996 _amr_nb=no
5997 fi 5963 fi
5998 fi 5964 fi
5999 if test "$_amr_nb" = yes ; then 5965 if test "$_amr_nb" = yes ; then
6000 _def_amr_nb='#define AMR_NB 1' 5966 _def_amr_nb='#define AMR_NB 1'
6001 else 5967 else
6002 _def_amr_nb='#undef AMR_NB' 5968 _def_amr_nb='#undef AMR_NB'
6003 fi 5969 fi
6004 echores "$_amr_nb $_echomsg" 5970 echores "$_amr_nb $_echomsg"
6005 5971
6006 echocheck "amr narrowband, fixed point" 5972 echocheck "amr narrowband, fixed point"
6007 _echomsg=""
6008 if test "$_amr_nb_fixed" = auto ; then 5973 if test "$_amr_nb_fixed" = auto ; then
5974 _amr_nb_fixed=no
6009 if test -f libavcodec/amr/dtx_dec.c ; then 5975 if test -f libavcodec/amr/dtx_dec.c ; then
6010 if test "$_libavcodec" = yes ; then 5976 if test "$_libavcodec" = yes ; then
6011 if test "$_amr_nb" = no ; then 5977 if test "$_amr_nb" = no ; then
6012 _amr_nb_fixed=yes 5978 _amr_nb_fixed=yes
6013 else 5979 else
6014 _amr_nb_fixed=no 5980 _res_comment="disabled by amr_nb"
6015 _echomsg="(disabled by amr_nb)"
6016 fi 5981 fi
6017 else 5982 else
6018 _amr_nb_fixed=no 5983 _res_comment="libavcodec (static) is required by amr_nb-fixed, sorry"
6019 _echomsg "libavcodec (static) is required by amr_nb-fixed, sorry"
6020 fi 5984 fi
6021 else
6022 _amr_nb_fixed=no
6023 fi 5985 fi
6024 fi 5986 fi
6025 if test "$_amr_nb_fixed" = yes ; then 5987 if test "$_amr_nb_fixed" = yes ; then
6026 _def_amr_nb='#define AMR_NB 1' 5988 _def_amr_nb='#define AMR_NB 1'
6027 _def_amr_nb_fixed='#define AMR_NB_FIXED 1' 5989 _def_amr_nb_fixed='#define AMR_NB_FIXED 1'
6028 _amr_nb=yes; 5990 _amr_nb=yes;
6029 else 5991 else
6030 _def_amr_nb_fixed='#undef AMR_NB_FIXED' 5992 _def_amr_nb_fixed='#undef AMR_NB_FIXED'
6031 fi 5993 fi
6032 echores "$_amr_nb_fixed $_echomsg" 5994 echores "$_amr_nb_fixed"
6033 5995
6034 if test "$_amr_nb" = yes ; then 5996 if test "$_amr_nb" = yes ; then
6035 _codecmodules="amr_nb $_codecmodules" 5997 _codecmodules="amr_nb $_codecmodules"
6036 else 5998 else
6037 _nocodecmodules="amr_nb $_nocodecmodules" 5999 _nocodecmodules="amr_nb $_nocodecmodules"
6038 fi 6000 fi
6039 6001
6040 echocheck "amr wideband" 6002 echocheck "amr wideband"
6041 _echomsg=""
6042 if test "$_amr_wb" = auto ; then 6003 if test "$_amr_wb" = auto ; then
6004 _amr_wb=no
6043 if test -f libavcodec/amrwb_float/dec_dtx.c ; then 6005 if test -f libavcodec/amrwb_float/dec_dtx.c ; then
6044 if test "$_libavcodec" = yes ; then 6006 if test "$_libavcodec" = yes ; then
6045 _amr_wb=yes 6007 _amr_wb=yes
6046 else 6008 else
6047 _amr_wb=no 6009 _res_comment="libavcodec (static) is required by amr_wb, sorry"
6048 _echomsg="libavcodec (static) is required by amr_wb, sorry"
6049 fi 6010 fi
6050 else
6051 _amr_wb=no
6052 fi 6011 fi
6053 fi 6012 fi
6054 if test "$_amr_wb" = yes ; then 6013 if test "$_amr_wb" = yes ; then
6055 _def_amr_wb='#define AMR_WB 1' 6014 _def_amr_wb='#define AMR_WB 1'
6056 _codecmodules="amr_wb $_codecmodules" 6015 _codecmodules="amr_wb $_codecmodules"
6057 else 6016 else
6058 _def_amr_wb='#undef AMR_WB' 6017 _def_amr_wb='#undef AMR_WB'
6059 _nocodecmodules="amr_wb $_nocodecmodules" 6018 _nocodecmodules="amr_wb $_nocodecmodules"
6060 fi 6019 fi
6061 echores "$_amr_wb $_echomsg" 6020 echores "$_amr_wb"
6062 6021
6063 echocheck "libdv-0.9.5+" 6022 echocheck "libdv-0.9.5+"
6064 if test "$_libdv" = auto ; then 6023 if test "$_libdv" = auto ; then
6065 _libdv=no 6024 _libdv=no
6066 cat > $TMPC <<EOF 6025 cat > $TMPC <<EOF
6092 if test "$_zr" = yes ; then 6051 if test "$_zr" = yes ; then
6093 if test "$_libavcodec" = yes ; then 6052 if test "$_libavcodec" = yes ; then
6094 _def_zr='#define HAVE_ZR 1' 6053 _def_zr='#define HAVE_ZR 1'
6095 _vosrc="$_vosrc vo_zr2.c vo_zr.c jpeg_enc.c" 6054 _vosrc="$_vosrc vo_zr2.c vo_zr.c jpeg_enc.c"
6096 _vomodules="zr zr2 $_vomodules" 6055 _vomodules="zr zr2 $_vomodules"
6097 echores "$_zr"
6098 else 6056 else
6099 echores "libavcodec (static) is required by zr, sorry" 6057 _res_comment="libavcodec (static) is required by zr, sorry"
6100 _novomodules="zr $_novomodules" 6058 _novomodules="zr $_novomodules"
6101 _def_zr='#undef HAVE_ZR' 6059 _def_zr='#undef HAVE_ZR'
6102 fi 6060 fi
6103 else 6061 else
6104 _def_zr='#undef HAVE_ZR' 6062 _def_zr='#undef HAVE_ZR'
6105 _novomodules="zr zr2 $_novomodules" 6063 _novomodules="zr zr2 $_novomodules"
6106 echores "$_zr" 6064 fi
6107 fi 6065 echores "$_zr"
6108 6066
6109 echocheck "bl" 6067 echocheck "bl"
6110 if test "$_bl" = yes ; then 6068 if test "$_bl" = yes ; then
6111 _def_bl='#define HAVE_BL 1' 6069 _def_bl='#define HAVE_BL 1'
6112 _vosrc="$_vosrc vo_bl.c" 6070 _vosrc="$_vosrc vo_bl.c"