pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backported the NAS detection from SDL 1.3, replacing the broken NetBSD patch

Browse source 
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402462
This commit is contained in:
Sam Lantinga 2007-07-10 14:16:44 +00:00
parent 8b10fbc3a1
commit 9c48629d64
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
configure.in
View file

@ -576,12 +576,20 @@ CheckNAS()
AC_HELP_STRING([--enable-nas], [support the NAS audio API [[default=yes]]]), AC_HELP_STRING([--enable-nas], [support the NAS audio API [[default=yes]]]),
, enable_nas=yes) , enable_nas=yes)
if test x$enable_audio = xyes -a x$enable_nas = xyes; then if test x$enable_audio = xyes -a x$enable_nas = xyes; then
AC_CHECK_HEADER(audio/audiolib.h, have_nas_hdr=yes)
AC_CHECK_LIB(audio, AuOpenServer, have_nas_lib=yes)
AC_MSG_CHECKING(for NAS audio support) AC_MSG_CHECKING(for NAS audio support)
have_nas=no have_nas=no
if true; then
if test x$have_nas_hdr = xyes -a x$have_nas_lib = xyes; then
have_nas=yes have_nas=yes
NAS_CFLAGS="" NAS_LIBS="-laudio"
NAS_LIBS="-laudio -lXt"
elif test -r /usr/X11R6/include/audio/audiolib.h; then
have_nas=yes
NAS_CFLAGS="-I/usr/X11R6/include/"
NAS_LIBS="-L/usr/X11R6/lib -laudio -lXt"
dnl On IRIX, the NAS includes are in a different directory, dnl On IRIX, the NAS includes are in a different directory,
dnl and libnas must be explicitly linked in dnl and libnas must be explicitly linked in
@ -590,7 +598,9 @@ AC_HELP_STRING([--enable-nas], [support the NAS audio API [[default=yes]]]),
have_nas=yes have_nas=yes
NAS_LIBS="-lnas -lXt" NAS_LIBS="-lnas -lXt"
fi fi
AC_MSG_RESULT($have_nas) AC_MSG_RESULT($have_nas)
if test x$have_nas = xyes; then if test x$have_nas = xyes; then
AC_DEFINE(SDL_AUDIO_DRIVER_NAS) AC_DEFINE(SDL_AUDIO_DRIVER_NAS)
SOURCES="$SOURCES $srcdir/src/audio/nas/*.c" SOURCES="$SOURCES $srcdir/src/audio/nas/*.c"