qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 14:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

this should fix the jack test

Browse source
This commit is contained in:
Bill Currie 2007-03-24 11:28:22 +00:00 committed by Jeff Teunissen
parent 605d7bde6a
commit dc09b6e5ec
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
configure.ac
View file

@ -958,7 +958,6 @@ AC_ARG_ENABLE(sound,
[ --disable-sound disable sound outright]) [ --disable-sound disable sound outright])
unset SOUND_TYPES unset SOUND_TYPES
AC_MSG_CHECKING(for sound support)
HAVE_ALSA=no HAVE_ALSA=no
if test "x$enable_alsa" != "xno"; then if test "x$enable_alsa" != "xno"; then
@ -1042,7 +1041,9 @@ JACK_LIBS=""
if test "x$enable_jack" != "xno"; then if test "x$enable_jack" != "xno"; then
if test "x$PKG_CONFIG" != "x"; then if test "x$PKG_CONFIG" != "x"; then
PKG_CHECK_MODULES([JACK], [jack], HAVE_JACK=yes, HAVE_JACK=no) PKG_CHECK_MODULES([JACK], [jack], HAVE_JACK=yes, HAVE_JACK=no)
SOUND_TYPES="$SOUND_TYPES JACK" if test "x$HAVE_JACK" = "xyes"; then
SOUND_TYPES="$SOUND_TYPES JACK"
fi
else else
AC_CHECK_LIB(jack, jack_client_open, HAVE_JACK=yes, HAVE_JACK=no, AC_CHECK_LIB(jack, jack_client_open, HAVE_JACK=yes, HAVE_JACK=no,
[$LIBS]) [$LIBS])
@ -1181,12 +1182,6 @@ if test "x$enable_sound" = "xno"; then
unset SOUND_TYPES unset SOUND_TYPES
fi fi
if test "$SOUND_TYPES"; then
AC_MSG_RESULT([$SOUND_TYPES])
else
AC_MSG_RESULT([no])
fi
dnl Tests for joystick support dnl Tests for joystick support
AC_MSG_CHECKING(for joystick support) AC_MSG_CHECKING(for joystick support)
if test -z "$JOYTYPE" -a "x$ac_cv_header_linux_joystick_h" = "xyes"; then if test -z "$JOYTYPE" -a "x$ac_cv_header_linux_joystick_h" = "xyes"; then