aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-20 08:47:06 +0200
committerMax Kellermann <max@duempel.org>2011-09-20 08:47:06 +0200
commit921553d7bb38345ba99c069fa1ee7816d5130c9b (patch)
tree879a0384b9a4bc93e9b3c3c476812c660b7e63b4 /configure.ac
parent27946a981ff4192f064feb3117567463c137933f (diff)
parentc476819cb1186770b1b7395851e394caac39cbc8 (diff)
downloadmpd-921553d7bb38345ba99c069fa1ee7816d5130c9b.tar.gz
mpd-921553d7bb38345ba99c069fa1ee7816d5130c9b.tar.xz
mpd-921553d7bb38345ba99c069fa1ee7816d5130c9b.zip
Merge branch 'v0.16.x'
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac19
1 files changed, 15 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 5e325265c..8aa49103b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -344,6 +344,11 @@ AC_ARG_ENABLE(sndfile,
[enable sndfile support]),,
enable_sndfile=auto)
+AC_ARG_ENABLE(solaris_output,
+ AS_HELP_STRING([--enable-solaris-output],
+ [enables the Solaris /dev/audio output]),,
+ [enable_solaris_output=auto])
+
AC_ARG_ENABLE(sqlite,
AS_HELP_STRING([--enable-sqlite],
[enable support for the SQLite database]),,
@@ -1377,16 +1382,22 @@ fi
AM_CONDITIONAL(HAVE_SHOUT, test x$enable_shout = xyes)
dnl --------------------------------- Solaris ---------------------------------
-case "$host_os" in
+
+if test x$enable_solaris_output = xauto; then
+ case "$host_os" in
solaris*)
- AC_DEFINE(ENABLE_SOLARIS_OUTPUT, 1, [Define to enable Solaris /dev/audio support])
enable_solaris_output=yes
;;
*)
enable_solaris_output=no
;;
-esac
+ esac
+fi
+
+if test x$enable_solaris_output = xyes; then
+ AC_DEFINE(ENABLE_SOLARIS_OUTPUT, 1, [Define to enable Solaris /dev/audio support])
+fi
AM_CONDITIONAL(ENABLE_SOLARIS_OUTPUT, test x$enable_solaris_output = xyes)
@@ -1573,7 +1584,7 @@ results(pulse, [PulseAudio])
results(mvp, [Media MVP])
results(shout, [SHOUTcast])
printf '\n\t'
-results(solaris, [Solaris])
+results(solaris_output, [Solaris])
results(winmm_output, [WinMM])
if