summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/moz.configure/old.configure1
-rw-r--r--config/system-headers2
-rw-r--r--media/libcubeb/src/moz.build2
-rw-r--r--media/libcubeb/tests/moz.build2
-rw-r--r--old-configure.in17
-rw-r--r--toolkit/library/moz.build2
6 files changed, 23 insertions, 3 deletions
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index 326b2327e..552019a13 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -215,6 +215,7 @@ def old_configure_options(*options):
'--enable-pref-extensions',
'--enable-private-build',
'--enable-pulseaudio',
+ '--enable-sndio',
'--enable-raw',
'--enable-readline',
'--enable-reflow-perf',
diff --git a/config/system-headers b/config/system-headers
index b4f901792..b10324f0f 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -910,7 +910,9 @@ signal.h
SimpleGameSound.h
SIOUX.h
size_t.h
+#ifdef MOZ_SNDIO
sndio.h
+#endif
someincludefile.h
Sound.h
soundcard.h
diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build
index be56876c6..4b36b80fb 100644
--- a/media/libcubeb/src/moz.build
+++ b/media/libcubeb/src/moz.build
@@ -43,7 +43,7 @@ if CONFIG['MOZ_JACK']:
]
DEFINES['USE_JACK'] = True
-if CONFIG['OS_ARCH'] == 'OpenBSD':
+if CONFIG['MOZ_SNDIO']:
SOURCES += [
'cubeb_sndio.c',
]
diff --git a/media/libcubeb/tests/moz.build b/media/libcubeb/tests/moz.build
index 1b17c7b1c..ca63a4d8f 100644
--- a/media/libcubeb/tests/moz.build
+++ b/media/libcubeb/tests/moz.build
@@ -68,7 +68,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
'-framework CoreFoundation',
'-framework AudioToolbox',
]
-elif CONFIG['OS_TARGET'] == 'OpenBSD':
+elif CONFIG['MOZ_SNDIO']:
OS_LIBS += [
'sndio',
]
diff --git a/old-configure.in b/old-configure.in
index dae43d6f1..6638ea688 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -3146,6 +3146,23 @@ fi
AC_SUBST(MOZ_PULSEAUDIO)
dnl ========================================================
+dnl = Enable sndio
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(sndio,
+[ --enable-sndio Enable sndio support],
+ MOZ_SNDIO=1,
+ MOZ_SNDIO= )
+
+if test -n "$MOZ_SNDIO"; then
+ AC_DEFINE(MOZ_SNDIO)
+ MOZ_CHECK_HEADER([sndio.h], [],
+ AC_MSG_ERROR(
+ [--enable-sndio specified but it requires sndio development headers]))
+ AC_DEFINE(MOZ_SNDIO)
+fi
+AC_SUBST(MOZ_SNDIO)
+
+dnl ========================================================
dnl NegotiateAuth
dnl ========================================================
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index 293c2feaf..4d870c73c 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -241,7 +241,7 @@ OS_LIBS += CONFIG['ICONV_LIBS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
OS_LIBS += CONFIG['TK_LIBS']
-if CONFIG['OS_ARCH'] == 'OpenBSD':
+if CONFIG['MOZ_SNDIO']:
OS_LIBS += [
'sndio',
]