qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

This should get ALSA 0.9 support working again. ALSA 0.9 users please test.

Browse source 
Report any compile or ./configure failures especially. If it reports you have
ALSA0_9, you should be using `set snd_plugin "alsa0_9"`.
This commit is contained in:
Ragnvald Maartmann-Moe IV 2004-01-19 20:37:58 +00:00
parent 77b2942982
commit a00e371ceb
1 changed files with 46 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
configure.ac
View file

@ -877,8 +877,10 @@ if test "x$enable_alsa" != "xno"; then
AC_EGREP_CPP([QF_maGiC_VALUE], AC_EGREP_CPP([QF_maGiC_VALUE],
[ [
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#if defined(SND_LIB_MAJOR) && defined(SND_LIB_MINOR) #if defined(SND_LIB_MAJOR) && defined(SND_LIB_MINOR) && \
#if SND_LIB_MAJOR > 0 || (SND_LIB_MAJOR == 0 && SND_LIB_MINOR >= 9) defined(SND_LIB_SUBMINOR)
#if SND_LIB_MAJOR > 0 || (SND_LIB_MAJOR == 0 && SND_LIB_MINOR >= 9 && \
SND_LIB_SUBMINOR >= 8)
QF_maGiC_VALUE QF_maGiC_VALUE
#endif #endif
#endif #endif
@ -889,8 +891,10 @@ QF_maGiC_VALUE
AC_EGREP_CPP([QF_maGiC_VALUE], AC_EGREP_CPP([QF_maGiC_VALUE],
[ [
#include <sys/asoundlib.h> #include <sys/asoundlib.h>
#if defined(SND_LIB_MAJOR) && defined(SND_LIB_MINOR) #if defined(SND_LIB_MAJOR) && defined(SND_LIB_MINOR) && \
#if SND_LIB_MAJOR > 0 || (SND_LIB_MAJOR == 0 && SND_LIB_MINOR >= 9) defined(SND_LIB_SUBMINOR)
#if SND_LIB_MAJOR > 0 || (SND_LIB_MAJOR == 0 && SND_LIB_MINOR >= 9 && \
SND_LIB_SUBMINOR >= 8)
QF_maGiC_VALUE QF_maGiC_VALUE
#endif #endif
#endif #endif
@ -902,6 +906,41 @@ QF_maGiC_VALUE
) )
fi fi
fi fi
if HAVE_ALSA == "no"; then
if test "x$enable_alsa" != "xno"; then
if test "x$ac_cv_header_sys_asoundlib_h" = "xyes" -o \
"x$ac_cv_header_alsa_asoundlib_h" = "xyes"; then
AC_EGREP_CPP([QF_maGiC_VALUE],
[
#include <alsa/asoundlib.h>
#if defined(SND_LIB_MAJOR) && defined(SND_LIB_MINOR) && \
defined(SND_LIB_SUBMINOR)
#if SND_LIB_MAJOR == 0 && SND_LIB_MINOR >= 9 && SND_LIB_SUBMINOR < 8
QF_maGiC_VALUE
#endif
#endif
],
SOUND_TYPES="$SOUND_TYPES ALSA0_9"
ALSA_LIBS="-lasound"
HAVE_ALSA=yes,
AC_EGREP_CPP([QF_maGiC_VALUE],
[
#include <sys/asoundlib.h>
#if (defined(SND_LIB_MAJOR) && defined(SND_LIB_MINOR) && \
defined(SND_LIB_SUBMINOR)
#if SND_LIB_MAJOR == 0 && SND_LIB_MINOR >= 9 && SND_LIB_SUBMINOR < 8
QF_maGiC_VALUE
#endif
#endif
],
SOUND_TYPES="$SOUND_TYPES ALSA0_9"
ALSA_LIBS="-lasound"
HAVE_ALSA=yes
)
)
fi
fi
fi
AC_SUBST(ALSA_LIBS) AC_SUBST(ALSA_LIBS)
AC_SUBST(HAVE_ALSA) AC_SUBST(HAVE_ALSA)
@ -1832,7 +1871,9 @@ if test -n "$CL_TARGETS"; then
CD_TARGETS="libQFcd.la" CD_TARGETS="libQFcd.la"
SND_TARGETS="libQFsound.la" SND_TARGETS="libQFsound.la"
JOY_TARGETS="libQFjs.la" JOY_TARGETS="libQFjs.la"
if test "`echo $SOUND_TYPES | grep ALSA`"; then if test "`echo $SOUND_TYPES | grep ALSA0_9`"; then
SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_alsa0_9.la"
elif test "`echo $SOUND_TYPES | grep ALSA`"; then
SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_alsa.la" SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_alsa.la"
fi fi
if test "`echo $SOUND_TYPES | grep MME`"; then if test "`echo $SOUND_TYPES | grep MME`"; then