configure.in
changeset 5410 12bc832d3fa8
parent 5408 35a63789c3f2
child 5411 e76c379a80ef
     1.1 --- a/configure.in	Mon Feb 28 09:06:15 2011 -0800
     1.2 +++ b/configure.in	Mon Feb 28 09:06:29 2011 -0800
     1.3 @@ -758,30 +758,6 @@
     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 -        AC_MSG_RESULT($have_dmedia)
    1.21 -        # Set up files for the audio library
    1.22 -        if test x$have_dmedia = xyes; then
    1.23 -            AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA)
    1.24 -            SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c"
    1.25 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio"
    1.26 -            have_audio=yes
    1.27 -        fi
    1.28 -    fi
    1.29 -}
    1.30 -
    1.31  dnl Check whether we want to use Tru64 UNIX native audio or not
    1.32  CheckMME()
    1.33  {
    1.34 @@ -973,12 +949,6 @@
    1.35              NAS_CFLAGS="-I/usr/X11R6/include/"
    1.36              NAS_LIBS="-L/usr/X11R6/lib -laudio -lXt"
    1.37  
    1.38 -        dnl On IRIX, the NAS includes are in a different directory,
    1.39 -        dnl and libnas must be explicitly linked in
    1.40 -
    1.41 -        elif test -r /usr/freeware/include/nas/audiolib.h; then
    1.42 -            have_nas=yes
    1.43 -            NAS_LIBS="-lnas -lXt"
    1.44          fi
    1.45  
    1.46          AC_MSG_RESULT($have_nas)
    1.47 @@ -1106,10 +1076,6 @@
    1.48                      x11_lib='libX11.so'
    1.49                      x11ext_lib='libXext.so'
    1.50                      ;;
    1.51 -                *-*-irix*) # IRIX 6.5 requires that we use /usr/lib32
    1.52 -                    x11_lib='libX11.so'
    1.53 -                    x11ext_lib='libXext.so'
    1.54 -                    ;;
    1.55                  *)
    1.56                      x11_lib=[`find_lib "libX11.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`]
    1.57                      x11ext_lib=[`find_lib "libXext.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`]
    1.58 @@ -1645,10 +1611,6 @@
    1.59              pthread_cflags="-D_REENTRANT -Kthread"
    1.60              pthread_lib=""
    1.61              ;;
    1.62 -        *-*-irix*)
    1.63 -            pthread_cflags="-D_SGI_MP_SOURCE"
    1.64 -            pthread_lib="-lpthread"
    1.65 -            ;;
    1.66          *-*-aix*)
    1.67              pthread_cflags="-D_REENTRANT -mthreads"
    1.68              pthread_lib="-lpthread"
    1.69 @@ -2024,7 +1986,7 @@
    1.70  
    1.71  dnl Set up the configuration based on the host platform!
    1.72  case "$host" in
    1.73 -    *-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-irix*|*-*-aix*|*-*-osf*|*-*-minix*)
    1.74 +    *-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-osf*|*-*-minix*)
    1.75          case "$host" in
    1.76              *-*-linux*)         ARCH=linux ;;
    1.77              *-*-uclinux*)       ARCH=linux ;;
    1.78 @@ -2040,7 +2002,6 @@
    1.79              *-*-sysv5*)         ARCH=sysv5 ;;
    1.80              *-*-solaris*)       ARCH=solaris ;;
    1.81              *-*-hpux*)          ARCH=hpux ;;
    1.82 -            *-*-irix*)          ARCH=irix ;;
    1.83              *-*-aix*)           ARCH=aix ;;
    1.84              *-*-osf*)           ARCH=osf ;;
    1.85              *-*-minix*)         ARCH=minix ;;
    1.86 @@ -2051,7 +2012,6 @@
    1.87          CheckDummyAudio
    1.88          CheckDLOPEN
    1.89          CheckOSS
    1.90 -        CheckDMEDIA
    1.91          CheckMME
    1.92          CheckALSA
    1.93          CheckPulseAudio
    1.94 @@ -2121,14 +2081,6 @@
    1.95                 ;;
    1.96               esac
    1.97          fi
    1.98 -        # Set up files for the thread library
    1.99 -        if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then
   1.100 -            AC_DEFINE(SDL_THREAD_SPROC)
   1.101 -            SOURCES="$SOURCES $srcdir/src/thread/irix/*.c"
   1.102 -            SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
   1.103 -            SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
   1.104 -            have_threads=yes
   1.105 -        fi
   1.106          # Set up files for the timer library
   1.107          if test x$enable_timers = xyes; then
   1.108              AC_DEFINE(SDL_TIMER_UNIX)
   1.109 @@ -2508,7 +2460,7 @@
   1.110  # Set runtime shared library paths as needed
   1.111  
   1.112  if test "x$enable_rpath" = "xyes"; then
   1.113 -  if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = irix -o $ARCH = linux -o $ARCH = netbsd; then
   1.114 +  if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = linux -o $ARCH = netbsd; then
   1.115      SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}"
   1.116    fi
   1.117    if test $ARCH = solaris; then