configure
changeset 5410 12bc832d3fa8
parent 5408 35a63789c3f2
child 5411 e76c379a80ef
     1.1 --- a/configure	Mon Feb 28 09:06:15 2011 -0800
     1.2 +++ b/configure	Mon Feb 28 09:06:29 2011 -0800
     1.3 @@ -21628,74 +21628,6 @@
     1.4      fi
     1.5  }
     1.6  
     1.7 -CheckDMEDIA()
     1.8 -{
     1.9 -    if test x$enable_audio = xyes; then
    1.10 -        { echo "$as_me:$LINENO: checking for dmedia audio support" >&5
    1.11 -echo $ECHO_N "checking for dmedia audio support... $ECHO_C" >&6; }
    1.12 -        have_dmedia=no
    1.13 -        cat >conftest.$ac_ext <<_ACEOF
    1.14 -/* confdefs.h.  */
    1.15 -_ACEOF
    1.16 -cat confdefs.h >>conftest.$ac_ext
    1.17 -cat >>conftest.$ac_ext <<_ACEOF
    1.18 -/* end confdefs.h.  */
    1.19 -
    1.20 -          #include <dmedia/audio.h>
    1.21 -
    1.22 -int
    1.23 -main ()
    1.24 -{
    1.25 -
    1.26 -          ALport audio_port;
    1.27 -
    1.28 -  ;
    1.29 -  return 0;
    1.30 -}
    1.31 -_ACEOF
    1.32 -rm -f conftest.$ac_objext
    1.33 -if { (ac_try="$ac_compile"
    1.34 -case "(($ac_try" in
    1.35 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    1.36 -  *) ac_try_echo=$ac_try;;
    1.37 -esac
    1.38 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    1.39 -  (eval "$ac_compile") 2>conftest.er1
    1.40 -  ac_status=$?
    1.41 -  grep -v '^ *+' conftest.er1 >conftest.err
    1.42 -  rm -f conftest.er1
    1.43 -  cat conftest.err >&5
    1.44 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    1.45 -  (exit $ac_status); } && {
    1.46 -	 test -z "$ac_c_werror_flag" ||
    1.47 -	 test ! -s conftest.err
    1.48 -       } && test -s conftest.$ac_objext; then
    1.49 -
    1.50 -        have_dmedia=yes
    1.51 -
    1.52 -else
    1.53 -  echo "$as_me: failed program was:" >&5
    1.54 -sed 's/^/| /' conftest.$ac_ext >&5
    1.55 -
    1.56 -
    1.57 -fi
    1.58 -
    1.59 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    1.60 -        { echo "$as_me:$LINENO: result: $have_dmedia" >&5
    1.61 -echo "${ECHO_T}$have_dmedia" >&6; }
    1.62 -        # Set up files for the audio library
    1.63 -        if test x$have_dmedia = xyes; then
    1.64 -            cat >>confdefs.h <<\_ACEOF
    1.65 -#define SDL_AUDIO_DRIVER_DMEDIA 1
    1.66 -_ACEOF
    1.67 -
    1.68 -            SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c"
    1.69 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio"
    1.70 -            have_audio=yes
    1.71 -        fi
    1.72 -    fi
    1.73 -}
    1.74 -
    1.75  CheckMME()
    1.76  {
    1.77          case $ARCH in
    1.78 @@ -22582,10 +22514,6 @@
    1.79              NAS_CFLAGS="-I/usr/X11R6/include/"
    1.80              NAS_LIBS="-L/usr/X11R6/lib -laudio -lXt"
    1.81  
    1.82 -
    1.83 -        elif test -r /usr/freeware/include/nas/audiolib.h; then
    1.84 -            have_nas=yes
    1.85 -            NAS_LIBS="-lnas -lXt"
    1.86          fi
    1.87  
    1.88          { echo "$as_me:$LINENO: result: $have_nas" >&5
    1.89 @@ -24096,10 +24024,6 @@
    1.90                      x11_lib='libX11.so'
    1.91                      x11ext_lib='libXext.so'
    1.92                      ;;
    1.93 -                *-*-irix*) # IRIX 6.5 requires that we use /usr/lib32
    1.94 -                    x11_lib='libX11.so'
    1.95 -                    x11ext_lib='libXext.so'
    1.96 -                    ;;
    1.97                  *)
    1.98                      x11_lib=`find_lib "libX11.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
    1.99                      x11ext_lib=`find_lib "libXext.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
   1.100 @@ -25834,10 +25758,6 @@
   1.101              pthread_cflags="-D_REENTRANT -Kthread"
   1.102              pthread_lib=""
   1.103              ;;
   1.104 -        *-*-irix*)
   1.105 -            pthread_cflags="-D_SGI_MP_SOURCE"
   1.106 -            pthread_lib="-lpthread"
   1.107 -            ;;
   1.108          *-*-aix*)
   1.109              pthread_cflags="-D_REENTRANT -mthreads"
   1.110              pthread_lib="-lpthread"
   1.111 @@ -28322,7 +28242,7 @@
   1.112  }
   1.113  
   1.114  case "$host" in
   1.115 -    *-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-irix*|*-*-aix*|*-*-osf*|*-*-minix*)
   1.116 +    *-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-osf*|*-*-minix*)
   1.117          case "$host" in
   1.118              *-*-linux*)         ARCH=linux ;;
   1.119              *-*-uclinux*)       ARCH=linux ;;
   1.120 @@ -28338,7 +28258,6 @@
   1.121              *-*-sysv5*)         ARCH=sysv5 ;;
   1.122              *-*-solaris*)       ARCH=solaris ;;
   1.123              *-*-hpux*)          ARCH=hpux ;;
   1.124 -            *-*-irix*)          ARCH=irix ;;
   1.125              *-*-aix*)           ARCH=aix ;;
   1.126              *-*-osf*)           ARCH=osf ;;
   1.127              *-*-minix*)         ARCH=minix ;;
   1.128 @@ -28349,7 +28268,6 @@
   1.129          CheckDummyAudio
   1.130          CheckDLOPEN
   1.131          CheckOSS
   1.132 -        CheckDMEDIA
   1.133          CheckMME
   1.134          CheckALSA
   1.135          CheckPulseAudio
   1.136 @@ -28437,17 +28355,6 @@
   1.137                 ;;
   1.138               esac
   1.139          fi
   1.140 -        # Set up files for the thread library
   1.141 -        if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then
   1.142 -            cat >>confdefs.h <<\_ACEOF
   1.143 -#define SDL_THREAD_SPROC 1
   1.144 -_ACEOF
   1.145 -
   1.146 -            SOURCES="$SOURCES $srcdir/src/thread/irix/*.c"
   1.147 -            SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
   1.148 -            SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
   1.149 -            have_threads=yes
   1.150 -        fi
   1.151          # Set up files for the timer library
   1.152          if test x$enable_timers = xyes; then
   1.153              cat >>confdefs.h <<\_ACEOF
   1.154 @@ -28950,7 +28857,7 @@
   1.155  # Set runtime shared library paths as needed
   1.156  
   1.157  if test "x$enable_rpath" = "xyes"; then
   1.158 -  if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = irix -o $ARCH = linux -o $ARCH = netbsd; then
   1.159 +  if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = linux -o $ARCH = netbsd; then
   1.160      SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}"
   1.161    fi
   1.162    if test $ARCH = solaris; then