Mercurial > mplayer.hg
comparison configure @ 27390:9d95dc936e66
Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.
Use it in all the places that checked for either ALSA 0.9 or 1.x.
| author | diego |
|---|---|
| date | Wed, 06 Aug 2008 23:19:29 +0000 |
| parents | ac03760f7fcc |
| children | 1d2faa1020fb |
comparison
equal
deleted
inserted
replaced
| 27389:f5f36f035807 | 27390:9d95dc936e66 |
|---|---|
| 5296 #endif | 5296 #endif |
| 5297 int main(void) { return 0; } | 5297 int main(void) { return 0; } |
| 5298 EOF | 5298 EOF |
| 5299 cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='1.0.x-alsa' | 5299 cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='1.0.x-alsa' |
| 5300 fi | 5300 fi |
| 5301 _def_alsa='#undef CONFIG_ALSA' | |
| 5301 _def_alsa5='#undef CONFIG_ALSA5' | 5302 _def_alsa5='#undef CONFIG_ALSA5' |
| 5302 _def_alsa9='#undef CONFIG_ALSA9' | 5303 _def_alsa9='#undef CONFIG_ALSA9' |
| 5303 _def_alsa1x='#undef CONFIG_ALSA1X' | 5304 _def_alsa1x='#undef CONFIG_ALSA1X' |
| 5304 _def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' | 5305 _def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' |
| 5305 _def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' | 5306 _def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' |
| 5314 _res_comment="using alsa 0.5.x and sys/asoundlib.h" | 5315 _res_comment="using alsa 0.5.x and sys/asoundlib.h" |
| 5315 elif test "$_alsaver" = '0.9.x-sys' ; then | 5316 elif test "$_alsaver" = '0.9.x-sys' ; then |
| 5316 _alsa9=yes | 5317 _alsa9=yes |
| 5317 _aosrc="$_aosrc ao_alsa.c" | 5318 _aosrc="$_aosrc ao_alsa.c" |
| 5318 _aomodules="alsa $_aomodules" | 5319 _aomodules="alsa $_aomodules" |
| 5320 _def_alsa='#define CONFIG_ALSA 1' | |
| 5319 _def_alsa9='#define CONFIG_ALSA9 1' | 5321 _def_alsa9='#define CONFIG_ALSA9 1' |
| 5320 _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' | 5322 _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' |
| 5321 _res_comment="using alsa 0.9.x and sys/asoundlib.h" | 5323 _res_comment="using alsa 0.9.x and sys/asoundlib.h" |
| 5322 elif test "$_alsaver" = '0.9.x-alsa' ; then | 5324 elif test "$_alsaver" = '0.9.x-alsa' ; then |
| 5323 _alsa9=yes | 5325 _alsa9=yes |
| 5324 _aosrc="$_aosrc ao_alsa.c" | 5326 _aosrc="$_aosrc ao_alsa.c" |
| 5325 _aomodules="alsa $_aomodules" | 5327 _aomodules="alsa $_aomodules" |
| 5328 _def_alsa='#define CONFIG_ALSA 1' | |
| 5326 _def_alsa9='#define CONFIG_ALSA9 1' | 5329 _def_alsa9='#define CONFIG_ALSA9 1' |
| 5327 _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' | 5330 _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' |
| 5328 _res_comment="using alsa 0.9.x and alsa/asoundlib.h" | 5331 _res_comment="using alsa 0.9.x and alsa/asoundlib.h" |
| 5329 elif test "$_alsaver" = '1.0.x-sys' ; then | 5332 elif test "$_alsaver" = '1.0.x-sys' ; then |
| 5330 _alsa1x=yes | 5333 _alsa1x=yes |
| 5331 _aosrc="$_aosrc ao_alsa.c" | 5334 _aosrc="$_aosrc ao_alsa.c" |
| 5332 _aomodules="alsa $_aomodules" | 5335 _aomodules="alsa $_aomodules" |
| 5336 _def_alsa='#define CONFIG_ALSA 1' | |
| 5333 _def_alsa1x="#define CONFIG_ALSA1X 1" | 5337 _def_alsa1x="#define CONFIG_ALSA1X 1" |
| 5334 _def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' | 5338 _def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' |
| 5335 _res_comment="using alsa 1.0.x and sys/asoundlib.h" | 5339 _res_comment="using alsa 1.0.x and sys/asoundlib.h" |
| 5336 elif test "$_alsaver" = '1.0.x-alsa' ; then | 5340 elif test "$_alsaver" = '1.0.x-alsa' ; then |
| 5337 _alsa1x=yes | 5341 _alsa1x=yes |
| 5338 _aosrc="$_aosrc ao_alsa.c" | 5342 _aosrc="$_aosrc ao_alsa.c" |
| 5339 _aomodules="alsa $_aomodules" | 5343 _aomodules="alsa $_aomodules" |
| 5344 _def_alsa='#define CONFIG_ALSA 1' | |
| 5340 _def_alsa1x="#define CONFIG_ALSA1X 1" | 5345 _def_alsa1x="#define CONFIG_ALSA1X 1" |
| 5341 _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' | 5346 _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' |
| 5342 _res_comment="using alsa 1.0.x and alsa/asoundlib.h" | 5347 _res_comment="using alsa 1.0.x and alsa/asoundlib.h" |
| 5343 else | 5348 else |
| 5344 _alsa=no | 5349 _alsa=no |
| 8364 | 8369 |
| 8365 /* Audio output drivers */ | 8370 /* Audio output drivers */ |
| 8366 $_def_ossaudio | 8371 $_def_ossaudio |
| 8367 $_def_ossaudio_devdsp | 8372 $_def_ossaudio_devdsp |
| 8368 $_def_ossaudio_devmixer | 8373 $_def_ossaudio_devmixer |
| 8374 $_def_alsa | |
| 8369 $_def_alsa5 | 8375 $_def_alsa5 |
| 8370 $_def_alsa9 | 8376 $_def_alsa9 |
| 8371 $_def_alsa1x | 8377 $_def_alsa1x |
| 8372 $_def_arts | 8378 $_def_arts |
| 8373 $_def_esd | 8379 $_def_esd |