actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

We should only need one check for ALSA, unless I missed something.

Browse Source
This commit is contained in:
Sean Burke
2003-07-03 20:39:03 +00:00
parent ddf76cefc9
commit 22800b1921
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/configure.ac
+1 -5
View File
@@ -32,11 +32,8 @@ AC_SEARCH_LIBS(mad_synth_init, [mad], have_mad=yes, have_mad=no)
AM_PATH_SDL AM_PATH_SDL
AM_PATH_ALSA(0.9.0, alsa=true ,alsa=0 ) AM_PATH_ALSA(0.9.0, alsa=true ,alsa=0 )
if test x$alsa = xtrue; then
AC_DEFINE(HAVE_ALSA, 1, [ALSA support available])
fi
AC_CHECK_HEADER(linux/soundcard.h, [AC_DEFINE(HAVE_OSS, 1, [OSS support available])]) AC_CHECK_HEADER(linux/soundcard.h, [AC_DEFINE(HAVE_OSS, 1, [OSS support available])])
AM_CONDITIONAL(ALSA, test x$alsa = xtrue ) AM_CONDITIONAL(HAVE_ALSA, test x$alsa = xtrue )
AM_CONDITIONAL(HAVE_OSS, test x$ac_cv_header_linux_soundcard_h = xyes ) AM_CONDITIONAL(HAVE_OSS, test x$ac_cv_header_linux_soundcard_h = xyes )
# We could do this more cleanly with an AC_CHECK_FUNCS wrapper. # We could do this more cleanly with an AC_CHECK_FUNCS wrapper.
@@ -83,4 +80,3 @@ AM_CONDITIONAL(DARWIN, test x$darwin = xtrue)
SDL_LIBS="`echo $SDL_LIBS | sed 's_-L/usr/lib/\?[[ $]]__'`" SDL_LIBS="`echo $SDL_LIBS | sed 's_-L/usr/lib/\?[[ $]]__'`"
AC_OUTPUT([Makefile src/Makefile]) AC_OUTPUT([Makefile src/Makefile])
stepmania/src/Makefile.am
+1 -2
View File
@@ -168,7 +168,7 @@ Sound_Null = \
arch/Sound/RageSoundDriver_Null.h arch/Sound/RageSoundDriver_Null.h
Sound = $(Sound_Null) Sound = $(Sound_Null)
if ALSA if HAVE_ALSA
Sound += $(Sound_ALSA9) Sound += $(Sound_ALSA9)
endif endif
if HAVE_OSS if HAVE_OSS
@@ -204,4 +204,3 @@ stepmania_LDADD = \
INCLUDES = $(SDL_CFLAGS) INCLUDES = $(SDL_CFLAGS)
# -O0 -g # -O0 -g