configure.in
changeset 148 8758b8d42cd9
parent 144 1cfa4282f2eb
child 153 2839f45bdba0
     1.1 --- a/configure.in	Thu Aug 09 13:06:32 2001 +0000
     1.2 +++ b/configure.in	Thu Aug 09 13:09:47 2001 +0000
     1.3 @@ -307,6 +307,29 @@
     1.4      fi
     1.5  }
     1.6  
     1.7 +dnl Check whether we want to use IRIX 6.5+ native audio or not
     1.8 +CheckDMEDIA()
     1.9 +{
    1.10 +    if test x$enable_audio = xyes; then
    1.11 +        AC_MSG_CHECKING(for dmedia audio support)
    1.12 +        have_dmedia=no
    1.13 +        AC_TRY_COMPILE([
    1.14 +          #include <dmedia/audio.h>
    1.15 +        ],[
    1.16 +          ALport audio_port;
    1.17 +        ],[
    1.18 +        have_dmedia=yes
    1.19 +        ])
    1.20 +        # Set up files for the audio library
    1.21 +        if test x$have_dmedia = xyes; then
    1.22 +            CFLAGS="$CFLAGS -DDMEDIA_SUPPORT"
    1.23 +            AUDIO_SUBDIRS="$AUDIO_SUBDIRS dmedia"
    1.24 +            AUDIO_DRIVERS="$AUDIO_DRIVERS dmedia/libaudio_dmedia.la"
    1.25 +            SYSTEM_LIBS="$SYSTEM_LIBS -laudio"
    1.26 +        fi
    1.27 +    fi
    1.28 +}
    1.29 +
    1.30  dnl Find the ESD includes and libraries
    1.31  CheckESD()
    1.32  {
    1.33 @@ -1203,6 +1226,7 @@
    1.34          # Set up files for the audio library
    1.35          # We use the OSS and ALSA API's, not the Sun audio API
    1.36          #if test x$enable_audio = xyes; then
    1.37 +        #    CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
    1.38          #    AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
    1.39          #    AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
    1.40          #fi
    1.41 @@ -1262,6 +1286,13 @@
    1.42          CheckPTHREAD
    1.43          # Set up files for the main() stub
    1.44          COPY_ARCH_SRC(src/main, linux, SDL_main.c)
    1.45 +        # Set up files for the audio library
    1.46 +        # We use the OSS and ALSA API's, not the Sun audio API
    1.47 +        #if test x$enable_audio = xyes; then
    1.48 +        #    CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
    1.49 +        #    AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
    1.50 +        #    AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
    1.51 +        #fi
    1.52          # Set up files for the joystick library
    1.53          # (No joystick support yet)
    1.54          if test x$enable_joystick = xyes; then
    1.55 @@ -1310,6 +1341,7 @@
    1.56          # Set up files for the audio library
    1.57          # We use the OSS and ALSA API's, not the Sun audio API
    1.58          #if test x$enable_audio = xyes; then
    1.59 +        #    CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
    1.60          #    AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
    1.61          #    AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
    1.62          #fi
    1.63 @@ -1360,6 +1392,7 @@
    1.64          COPY_ARCH_SRC(src/main, linux, SDL_main.c)
    1.65          # Set up files for the audio library
    1.66          if test x$enable_audio = xyes; then
    1.67 +            CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
    1.68              AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
    1.69              AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
    1.70          fi
    1.71 @@ -1414,6 +1447,7 @@
    1.72          # Set up files for the audio library
    1.73          # We use the OSS and native API's, not the Sun audio API
    1.74          #if test x$enable_audio = xyes; then
    1.75 +        #    CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
    1.76          #    AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
    1.77          #    AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
    1.78          #fi
    1.79 @@ -1471,6 +1505,7 @@
    1.80          COPY_ARCH_SRC(src/main, linux, SDL_main.c)
    1.81          # Set up files for the audio library
    1.82          if test x$enable_audio = xyes; then
    1.83 +            CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
    1.84              AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
    1.85              AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
    1.86          fi
    1.87 @@ -1519,6 +1554,7 @@
    1.88          COPY_ARCH_SRC(src/main, linux, SDL_main.c)
    1.89          # Set up files for the audio library
    1.90          if test x$enable_audio = xyes; then
    1.91 +            CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
    1.92              AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
    1.93              AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
    1.94          fi
    1.95 @@ -1552,6 +1588,8 @@
    1.96          ARCH=irix
    1.97          CheckDummyVideo
    1.98          CheckDiskAudio
    1.99 +        CheckDMEDIA
   1.100 +        CheckESD
   1.101          CheckNAS
   1.102          CheckX11
   1.103          CheckAAlib
   1.104 @@ -1559,12 +1597,12 @@
   1.105          CheckPTHREAD
   1.106          # Set up files for the main() stub
   1.107          COPY_ARCH_SRC(src/main, linux, SDL_main.c)
   1.108 -        # Set up files for the audio library
   1.109 -        if test x$enable_audio = xyes; then
   1.110 -            AUDIO_SUBDIRS="$AUDIO_SUBDIRS dmedia"
   1.111 -            AUDIO_DRIVERS="$AUDIO_DRIVERS dmedia/libaudio_dmedia.la"
   1.112 -            SYSTEM_LIBS="$SYSTEM_LIBS -laudio"
   1.113 -        fi
   1.114 +        # We use the dmedia audio API, not the Sun audio API
   1.115 +        #if test x$enable_audio = xyes; then
   1.116 +        #    CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
   1.117 +        #    AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
   1.118 +        #    AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
   1.119 +        #fi
   1.120          # Set up files for the joystick library
   1.121          # (No joystick support yet)
   1.122          if test x$enable_joystick = xyes; then
   1.123 @@ -1622,6 +1660,7 @@
   1.124          COPY_ARCH_SRC(src/main, linux, SDL_main.c)
   1.125          # Set up files for the audio library
   1.126          if test x$enable_audio = xyes; then
   1.127 +            CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
   1.128              AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
   1.129              AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
   1.130          fi
   1.131 @@ -1710,6 +1749,7 @@
   1.132          COPY_ARCH_SRC(src/main, linux, SDL_main.c)
   1.133          # Set up files for the audio library
   1.134          if test x$enable_audio = xyes; then
   1.135 +            CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
   1.136              AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
   1.137              AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
   1.138          fi
   1.139 @@ -1757,8 +1797,6 @@
   1.140              SYSTEM_LIBS="$SYSTEM_LIBS -lasound"
   1.141              AUDIO_SUBDIRS="$AUDIO_SUBDIRS nto"
   1.142              AUDIO_DRIVERS="$AUDIO_DRIVERS nto/libaudio_nto.la"
   1.143 -            AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
   1.144 -            AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
   1.145          fi
   1.146          # Set up files for the joystick library
   1.147          if test x$enable_joystick = xyes; then