# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1184077004 0
# Node ID 4ea82f5e7e2cf2e6973d7e180b0dbd15e77dbfeb
# Parent  24c3ca822658db509d49ae76fb4cb6401612db91
Backported the NAS detection from SDL 1.3, replacing the broken NetBSD patch

diff -r 24c3ca822658 -r 4ea82f5e7e2c configure.in
--- a/configure.in	Tue Jul 10 13:52:07 2007 +0000
+++ b/configure.in	Tue Jul 10 14:16:44 2007 +0000
@@ -576,12 +576,20 @@
 AC_HELP_STRING([--enable-nas], [support the NAS audio API [[default=yes]]]),
                   , enable_nas=yes)
     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)
         have_nas=no
-        if true; then
+
+        if test x$have_nas_hdr = xyes -a x$have_nas_lib = xyes; then
             have_nas=yes
-            NAS_CFLAGS=""
-            NAS_LIBS="-laudio -lXt"
+            NAS_LIBS="-laudio"
+
+        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 and libnas must be explicitly linked in
@@ -590,7 +598,9 @@
             have_nas=yes
             NAS_LIBS="-lnas -lXt"
         fi
+
         AC_MSG_RESULT($have_nas)
+
         if test x$have_nas = xyes; then
             AC_DEFINE(SDL_AUDIO_DRIVER_NAS)
             SOURCES="$SOURCES $srcdir/src/audio/nas/*.c"