autoconfiscate the alsa plugin name

This commit is contained in:
Bill Currie 2004-01-20 05:43:23 +00:00
parent e154c9add5
commit f097c2e206
2 changed files with 10 additions and 5 deletions

View file

@ -16,6 +16,8 @@
%define BUILD_GL '@CAN_BUILD_GL@'
%define BUILD_SW '@CAN_BUILD_SW@'
%define ALSA_PLUGIN '@ALSA_PLUGIN@'
%define fs_sharepath %{_prefix}/share/games/quakeforge
Name: %{name}
@ -199,11 +201,11 @@ package.
%if "%{HAVE_ALSA}"=="'yes'"
%package alsa
Summary: ALSA 0.9 sound plugin for QuakeForge
Summary: ALSA sound plugin for QuakeForge
Group: Amusements/Games
#Requires:
%description alsa
The ALSA 0.9 plugin for QuakeForge provides digital audio output for QuakeForge
The ALSA plugin for QuakeForge provides digital audio output for QuakeForge
targets that contain clients.
%endif
@ -400,7 +402,7 @@ rm -rf $RPM_BUILD_ROOT
%if "%{HAVE_ALSA}"=="'yes'"
%files alsa
%attr(-,root,root) %{_prefix}/lib/quakeforge/snd_output_alsa.so*
%attr(-,root,root) %{_prefix}/lib/quakeforge/%{ALSA_PLUGIN}.so*
%endif
%if "%{HAVE_OSS}"=="'yes'"

View file

@ -1872,9 +1872,11 @@ if test -n "$CL_TARGETS"; then
SND_TARGETS="libQFsound.la"
JOY_TARGETS="libQFjs.la"
if test "`echo $SOUND_TYPES | grep ALSA0_9`"; then
SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_alsa0_9.la"
ALSA_PLUGIN="snd_output_alsa0_9"
SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS $ALSA_PLUGIN.la"
elif test "`echo $SOUND_TYPES | grep ALSA`"; then
SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_alsa.la"
ALSA_PLUGIN="snd_output_alsa"
SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS $ALSA_PLUGIN.la"
fi
if test "`echo $SOUND_TYPES | grep MME`"; then
SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_mme.la"
@ -1910,6 +1912,7 @@ else
SND_TARGETS=""
unset SOUND_TYPES
fi
AC_SUBST(ALSA_PLUGIN)
SERVER_PLUGIN_TARGETS="console_server.la"
SERVER_PLUGIN_STATIC=""