# HG changeset patch # User joyping # Date 1084402163 0 # Node ID d4f559200e1661641fe86c15b74e451051412285 # Parent 3a7ef0fbc2f9aea84d55c0a45a929cbc58c846a7 changes for alsa9/alsa1.x merge, only alsa. diff -r 3a7ef0fbc2f9 -r d4f559200e16 configure --- a/configure Wed May 12 22:48:15 2004 +0000 +++ b/configure Wed May 12 22:49:23 2004 +0000 @@ -4057,26 +4057,26 @@ _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' echores "yes (using alsa 0.5.x and sys/asoundlib.h)" elif test "$_alsaver" = '0.9.x-sys' ; then - _aosrc="$_aosrc ao_alsa9.c" - _aomodules="alsa9 $_aomodules" + _aosrc="$_aosrc ao_alsa.c" + _aomodules="alsa $_aomodules" _def_alsa9='#define HAVE_ALSA9 1' _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' echores "yes (using alsa 0.9.x and sys/asoundlib.h)" elif test "$_alsaver" = '0.9.x-alsa' ; then - _aosrc="$_aosrc ao_alsa9.c" - _aomodules="alsa9 $_aomodules" + _aosrc="$_aosrc ao_alsa.c" + _aomodules="alsa $_aomodules" _def_alsa9='#define HAVE_ALSA9 1' _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' echores "yes (using alsa 0.9.x and alsa/asoundlib.h)" elif test "$_alsaver" = '1.0.x-sys' ; then - _aosrc="$_aosrc ao_alsa1x.c" - _aomodules="alsa1x $_aomodules" + _aosrc="$_aosrc ao_alsa.c" + _aomodules="alsa $_aomodules" _def_alsa1x="#define HAVE_ALSA1X 1" _def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' echores "yes (using alsa 1.0.x and sys/asoundlib.h)" elif test "$_alsaver" = '1.0.x-alsa' ; then - _aosrc="$_aosrc ao_alsa1x.c" - _aomodules="alsa1x $_aomodules" + _aosrc="$_aosrc ao_alsa.c" + _aomodules="alsa $_aomodules" _def_alsa1x="#define HAVE_ALSA1X 1" _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' echores "yes (using alsa 1.0.x and alsa/asoundlib.h)"