summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Sinclair <radarsat1@gmail.com>2019-01-24 12:43:47 +0100
committerStephen Sinclair <radarsat1@gmail.com>2019-01-24 13:04:52 +0100
commitbd3db58ad06f739fecbf7afe7a5c5df5a366c700 (patch)
tree1e9fc04fff1dbadeecfad6c6150c23333fd150c1
parentaba5317deff92ec5a4872ea17b69bbc4b1fb55b5 (diff)
automake: fix inconsistency between --with-ds and --with-dsound
Go with --with-dsound.
-rw-r--r--configure.ac10
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 0b7477f..1a2314c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,7 +154,7 @@ AS_IF([test "x$with_pulse" = "xyes"], [systems="$systems pulse"])
AS_IF([test "x$with_oss" = "xyes"], [systems="$systems oss"])
AS_IF([test "x$with_core" = "xyes"], [systems="$systems core"])
AS_IF([test "x$with_asio" = "xyes"], [systems="$systems asio"])
-AS_IF([test "x$with_dsound" = "xyes"], [systems="$systems ds"])
+AS_IF([test "x$with_dsound" = "xyes"], [systems="$systems dsound"])
AS_IF([test "x$with_wasapi" = "xyes"], [systems="$systems wasapi"])
required=" $systems "
@@ -166,9 +166,9 @@ AS_IF([test "x$systems" = "x"],
[*-*-freebsd*], [systems="oss"],
[*-*-linux*], [systems="alsa pulse jack oss"],
[*-apple*], [systems="core jack"],
- [*-mingw32*], [systems="asio ds wasapi jack"],
- [*-mingw64*], [systems="asio ds wasapi jack"],
- [*-msys*], [systems="asio ds wasapi jack"],
+ [*-mingw32*], [systems="asio dsound wasapi jack"],
+ [*-mingw64*], [systems="asio dsound wasapi jack"],
+ [*-msys*], [systems="asio dsound wasapi jack"],
))
# If any were specifically requested disabled, do it.
@@ -260,7 +260,7 @@ AS_CASE(["$systems"], [*" asio "*], [
found="$found ASIO"
])
-AS_CASE(["$systems"], [*" ds "*], [
+AS_CASE(["$systems"], [*" dsound "*], [
AC_CHECK_HEADERS(windows.h)
AC_CHECK_HEADERS(mmsystem.h mmreg.h dsound.h, [], [],
[#ifdef HAVE_WINDOWS_H