From ce3c58e2387e577fe5e2c30ce75a90028eb2630e Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 20 Jan 2004 08:26:16 +0000 Subject: [PATCH] need to /always/ set ALSA_PLUGIN --- configure.ac | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 1ad918a2d..e2b679468 100644 --- a/configure.ac +++ b/configure.ac @@ -1870,15 +1870,17 @@ AC_SUBST(HAVE_SDL) AC_SUBST(HAVE_SVGA) AC_SUBST(HAVE_X) +ALSA_PLUGIN="snd_output_alsa" +if test "`echo $SOUND_TYPES | grep ALSA0_9`"; then + ALSA_PLUGIN="snd_output_alsa0_9" +fi + if test -n "$CL_TARGETS"; then CD_TARGETS="libQFcd.la" SND_TARGETS="libQFsound.la" JOY_TARGETS="libQFjs.la" - if test "`echo $SOUND_TYPES | grep ALSA0_9`"; then - ALSA_PLUGIN="snd_output_alsa0_9" - SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS $ALSA_PLUGIN.la" - elif test "`echo $SOUND_TYPES | grep ALSA`"; then - ALSA_PLUGIN="snd_output_alsa" + # the following will catch both ALSA and ALSA0_9 + if test "`echo $SOUND_TYPES | grep ALSA`"; then SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS $ALSA_PLUGIN.la" fi if test "`echo $SOUND_TYPES | grep MME`"; then