diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-01-18 19:54:34 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-01-18 19:54:34 +0000 |
| commit | 3119dd2de36dbd8bb9af95ab1826c15f3099b597 (patch) | |
| tree | 76b0324c6e93b86550e63ad02f1154580ce79526 /m4 | |
| parent | 7366cab446742882341e4a5304527e8b1a6965eb (diff) | |
| parent | cb6e4b4ffd49cdef83c6d025f175cf6a79705fc8 (diff) | |
| download | xine-lib-3119dd2de36dbd8bb9af95ab1826c15f3099b597.tar.gz xine-lib-3119dd2de36dbd8bb9af95ab1826c15f3099b597.tar.bz2 | |
Merge.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/audio_out.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/m4/audio_out.m4 b/m4/audio_out.m4 index 59bd1abae..5041dfbba 100644 --- a/m4/audio_out.m4 +++ b/m4/audio_out.m4 @@ -13,7 +13,8 @@ AC_DEFUN([XINE_AUDIO_OUT_PLUGINS], [ dnl - Jack is Linux and Mac OS X primarily dnl - OSS is most unix variants dnl - PulseAudio has been tested on Linux, Solaris, FreeBSD, Windows - dnl - SunAudio is NetBSD, OpenBSD, Solaris (anything else?) + dnl - SunAudio is NetBSD, Solaris (anything else?) + dnl - sndio is OpenBSD only default_enable_coreaudio=no default_enable_irixal=no @@ -58,7 +59,7 @@ AC_DEFUN([XINE_AUDIO_OUT_PLUGINS], [ default_enable_sunaudio=yes ;; openbsd*) - default_enable_sunaudio=yes + default_enable_oss=no default_enable_sndio=yes ;; solaris*) @@ -201,8 +202,8 @@ AC_DEFUN([XINE_AUDIO_OUT_PLUGINS], [ if test x"$hard_enable_sunaudio" = x"yes" && test x"$have_sunaudio" != x"yes"; then AC_MSG_ERROR([Sun audio support requested, but Sun audio not found]) elif test x"$have_sunaudio" = x"yes"; then - dnl NetBSD and OpenBSD don't have this, but check for it - dnl rather than assuming that it doesn't happen elsewhere. + dnl NetBSD doesn't have this, but check for it rather than + dnl assuming that it doesn't happen elsewhere. AC_CHECK_MEMBERS([audio_info_t.output_muted]) fi fi |