* configure.ac: Allow for --with-sound=voxware that will enable

sound but otherwise disable ALSA.  This will use the OSS device,
typically /dev/dsp, for sound output.

Fixes: debbugs:15067

diff --git a/ChangeLog b/ChangeLog
index 4fd209d4e697b25ab1ea77cb4cadc94bc7aabfd2..871a07788b464351d77e4a7e4d228610c84d38e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-31  Ulrich Müller  <ulm@gentoo.org>
+
+       * configure.ac: Allow for --with-sound=voxware that will enable
+       sound but otherwise disable ALSA.  This will use the OSS device,
+       typically /dev/dsp, for sound output.  (Bug#15067)
+
 2013-08-31  Glenn Morris  <rgm@gnu.org>
 
        * make-dist: Update for nt/INSTALL* changes.

diff --git a/configure.ac b/configure.ac
index 43c78eb2ebc41640fdac564d1cc3f0b2add4631f..ef06c6c2b3b27b911b868bf480de81865694c118 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -167,12 +167,12 @@ AC_ARG_WITH([mailhost],[AS_HELP_STRING([--with-mailhost=HOSTNAME],
     AC_DEFINE_UNQUOTED(MAILHOST, ["$withval"], [String giving fallback POP mail host.]))
 
 AC_ARG_WITH([sound],[AS_HELP_STRING([--with-sound=VALUE],
-  [compile with sound support (VALUE one of: yes, ossaudio, alsa, no;
+  [compile with sound support (VALUE one of: yes, ossaudio, alsa, voxware, no;
 default yes).  Only for GNU/Linux, FreeBSD, NetBSD, MinGW.])],
   [ case "${withval}" in
-      yes|no|ossaudio|alsa) val=$withval ;;
+      yes|no|ossaudio|alsa|voxware) val=$withval ;;
       *) AC_MSG_ERROR([`--with-sound=$withval' is invalid;
-this option's value should be `yes', `no', `ossaudio', or `alsa'.])
+this option's value should be `yes', `no', `ossaudio', `alsa', or `voxware'.])
       ;;
     esac
     with_sound=$val
@@ -1307,6 +1307,9 @@ if test "${with_sound}" != "no"; then
     #include <windows.h>
     #endif
     ])
+  test "${with_sound}" = "voxware" && test "${have_sound_header}" != "yes" && \
+    AC_MSG_ERROR([OSS/Voxware sound support requested but not found.])
+
   if test "${with_sound}" = "ossaudio" || test "${with_sound}" = "yes"; then
     # Emulation library used on NetBSD.
     AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)