configure
changeset 7391 a29895dc5e9a
parent 7388 058097637b4c
child 7433 8f118396264b
     1.1 --- a/configure	Tue Jul 09 12:58:54 2013 -0700
     1.2 +++ b/configure	Wed Jul 10 02:32:04 2013 -0700
     1.3 @@ -1511,7 +1511,7 @@
     1.4    --enable-sse            use SSE assembly routines [[default=yes]]
     1.5    --enable-sse2           use SSE2 assembly routines [[default=no]]
     1.6    --enable-altivec        use Altivec assembly routines [[default=yes]]
     1.7 -  --enable-oss            support the OSS audio API [[default=yes]]
     1.8 +  --enable-oss            support the OSS audio API [[default=maybe]]
     1.9    --enable-alsa           support the ALSA audio API [[default=yes]]
    1.10    --disable-alsatest      Do not try to compile and run a test Alsa program
    1.11    --enable-alsa-shared    dynamically load ALSA audio support [[default=yes]]
    1.12 @@ -17535,8 +17535,20 @@
    1.13  if test "${enable_oss+set}" = set; then :
    1.14    enableval=$enable_oss;
    1.15  else
    1.16 -  enable_oss=yes
    1.17 -fi
    1.18 +  enable_oss=maybe
    1.19 +fi
    1.20 +
    1.21 +
    1.22 +    # OpenBSD "has" OSS, but it's not really for app use. They want you to
    1.23 +    #  use sndio instead. So on there, we default to disabled. You can force
    1.24 +    #  it on if you really want, though.
    1.25 +    if test x$enable_oss = xmaybe; then
    1.26 +        enable_oss=yes
    1.27 +        case "$host" in
    1.28 +            *-*-openbsd*)
    1.29 +                enable_oss=no;;
    1.30 +        esac
    1.31 +    fi
    1.32  
    1.33      if test x$enable_audio = xyes -a x$enable_oss = xyes; then
    1.34          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSS audio support" >&5
    1.35 @@ -21423,6 +21435,9 @@
    1.36              # We can fake these with semaphores and mutexes if necessary
    1.37              SOURCES="$SOURCES $srcdir/src/thread/pthread/SDL_syscond.c"
    1.38  
    1.39 +            # Thread local storage
    1.40 +            SOURCES="$SOURCES $srcdir/src/thread/pthread/SDL_systls.c"
    1.41 +
    1.42              have_threads=yes
    1.43          fi
    1.44      fi
    1.45 @@ -22206,7 +22221,7 @@
    1.46                  SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
    1.47                  have_audio=yes
    1.48              ;;
    1.49 -            netbsd|openbsd)
    1.50 +            netbsd)  # Don't use this on OpenBSD, it's busted.
    1.51  
    1.52  $as_echo "#define SDL_AUDIO_DRIVER_BSD 1" >>confdefs.h
    1.53  
    1.54 @@ -22367,9 +22382,7 @@
    1.55  
    1.56  $as_echo "#define SDL_THREAD_WINDOWS 1" >>confdefs.h
    1.57  
    1.58 -            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_sysmutex.c"
    1.59 -            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_syssem.c"
    1.60 -            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_systhread.c"
    1.61 +            SOURCES="$SOURCES $srcdir/src/thread/windows/*.c"
    1.62              SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
    1.63              have_threads=yes
    1.64          fi