Mercurial > mplayer.hg

comparison configure @ 34259:a9bfa5a9fcac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ao_alsa: drop check for sys/asoundlib.h and ALSA version The ALSA output driver uses some parts of the ALSA API that were introduced after the switch to alsa/asoundlib.h, so checking for the deprecated header location is pointless as it has no chance of working anyway. Also, now that both ALSA output and input work with the 0.9 and 1.0 series, there is no need to keep checking for the ALSA version.
author diego
date Mon, 14 Nov 2011 09:58:26 +0000
parents 1c35122fba8c
children 8ddad79e3c91
comparison
equal deleted inserted replaced
34258:11ab37356dd1 34259:a9bfa5a9fcac
5485 else 5485 else
5486 noaomodules="openal $noaomodules" 5486 noaomodules="openal $noaomodules"
5487 fi 5487 fi
5488 echores "$_openal" 5488 echores "$_openal"
5489 5489
5490
5490 echocheck "ALSA audio" 5491 echocheck "ALSA audio"
5491 if test "$_alloca" != yes ; then 5492 if test "$_alloca" = yes && test "$_alsa" = auto ; then
5492 _alsa=no 5493 _alsa=no
5493 res_comment="alloca missing" 5494 header_check alsa/asoundlib.h -lasound $ld_dl $ld_pthread && _alsa=yes
5494 fi 5495 fi
5495 if test "$_alsa" != no ; then 5496 if test "$_alsa" = yes ; then
5496 _alsa=no 5497 aomodules="alsa $aomodules"
5497 cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)' -lasound $ld_dl $ld_pthread && _alsaver='0.9.x-sys' 5498 def_alsa='#define CONFIG_ALSA 1'
5498 cpp_condition_check 'alsa/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)' -lasound $ld_dl $ld_pthread && _alsaver='0.9.x-alsa'
5499 cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)' -lasound $ld_dl $ld_pthread && _alsaver='1.0.x-sys'
5500 cpp_condition_check 'alsa/asoundlib.h' '(SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)' -lasound $ld_dl $ld_pthread && _alsaver='1.0.x-alsa'
5501 fi
5502 def_alsa='#undef CONFIG_ALSA'
5503 def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H'
5504 def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H'
5505 if test "$_alsaver" ; then
5506 _alsa=yes
5507 if test "$_alsaver" = '0.9.x-sys' ; then
5508 aomodules="alsa $aomodules"
5509 def_alsa='#define CONFIG_ALSA 1'
5510 def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
5511 res_comment="using alsa 0.9.x and sys/asoundlib.h"
5512 elif test "$_alsaver" = '0.9.x-alsa' ; then
5513 aomodules="alsa $aomodules"
5514 def_alsa='#define CONFIG_ALSA 1'
5515 def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1'
5516 res_comment="using alsa 0.9.x and alsa/asoundlib.h"
5517 elif test "$_alsaver" = '1.0.x-sys' ; then
5518 aomodules="alsa $aomodules"
5519 def_alsa='#define CONFIG_ALSA 1'
5520 def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
5521 res_comment="using alsa 1.0.x and sys/asoundlib.h"
5522 elif test "$_alsaver" = '1.0.x-alsa' ; then
5523 aomodules="alsa $aomodules"
5524 def_alsa='#define CONFIG_ALSA 1'
5525 def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1'
5526 res_comment="using alsa 1.0.x and alsa/asoundlib.h"
5527 else
5528 _alsa=no
5529 res_comment="unknown version"
5530 fi
5531 extra_ldflags="$extra_ldflags -lasound $ld_dl $ld_pthread" 5499 extra_ldflags="$extra_ldflags -lasound $ld_dl $ld_pthread"
5532 else 5500 else
5533 noaomodules="alsa $noaomodules" 5501 noaomodules="alsa $noaomodules"
5502 def_alsa='#undef CONFIG_ALSA'
5534 fi 5503 fi
5535 echores "$_alsa" 5504 echores "$_alsa"
5536 5505
5537 5506
5538 echocheck "Sun audio" 5507 echocheck "Sun audio"
8347 $def_dvdcss 8316 $def_dvdcss
8348 8317
8349 8318
8350 /* system headers */ 8319 /* system headers */
8351 $def_alloca_h 8320 $def_alloca_h
8352 $def_alsa_asoundlib_h
8353 $def_altivec_h 8321 $def_altivec_h
8354 $def_malloc_h 8322 $def_malloc_h
8355 $def_mman_h 8323 $def_mman_h
8356 $def_mman_has_map_failed 8324 $def_mman_has_map_failed
8357 $def_soundcard_h 8325 $def_soundcard_h
8358 $def_sys_asoundlib_h
8359 $def_sys_soundcard_h 8326 $def_sys_soundcard_h
8360 $def_sys_sysinfo_h 8327 $def_sys_sysinfo_h
8361 $def_sys_videoio_h 8328 $def_sys_videoio_h
8362 $def_termios_h 8329 $def_termios_h
8363 $def_termios_sys_h 8330 $def_termios_sys_h