[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114082: * configure.ac (--with-sound): Rename ossau
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r114082: * configure.ac (--with-sound): Rename ossaudio to bsd-ossaudio, |
Date: |
Sat, 31 Aug 2013 20:00:52 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114082
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-08-31 13:00:22 -0700
message:
* configure.ac (--with-sound): Rename ossaudio to bsd-ossaudio,
and voxware to oss.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-08-31 19:54:17 +0000
+++ b/ChangeLog 2013-08-31 20:00:22 +0000
@@ -1,3 +1,8 @@
+2013-08-31 Glenn Morris <address@hidden>
+
+ * configure.ac (--with-sound): Rename ossaudio to bsd-ossaudio,
+ and voxware to oss.
+
2013-08-31 Ulrich Müller <address@hidden>
* configure.ac: Allow for --with-sound=voxware that will enable
=== modified file 'configure.ac'
--- a/configure.ac 2013-08-31 19:54:17 +0000
+++ b/configure.ac 2013-08-31 20:00:22 +0000
@@ -167,12 +167,12 @@
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, voxware, no;
+ [compile with sound support (VALUE one of: yes, alsa, oss, bsd-ossaudio, no;
default yes). Only for GNU/Linux, FreeBSD, NetBSD, MinGW.])],
[ case "${withval}" in
- yes|no|ossaudio|alsa|voxware) val=$withval ;;
+ yes|no|alsa|oss|bsd-ossaudio) val=$withval ;;
*) AC_MSG_ERROR([`--with-sound=$withval' is invalid;
-this option's value should be `yes', `no', `ossaudio', `alsa', or `voxware'.])
+this option's value should be `yes', `no', `alsa', `oss', or `bsd-ossaudio'.])
;;
esac
with_sound=$val
@@ -1307,15 +1307,15 @@
#include <windows.h>
#endif
])
- test "${with_sound}" = "voxware" && test "${have_sound_header}" != "yes" && \
- AC_MSG_ERROR([OSS/Voxware sound support requested but not found.])
+ test "${with_sound}" = "oss" && test "${have_sound_header}" != "yes" && \
+ AC_MSG_ERROR([OSS sound support requested but not found.])
- if test "${with_sound}" = "ossaudio" || test "${with_sound}" = "yes"; then
+ if test "${with_sound}" = "bsd-ossaudio" || test "${with_sound}" = "yes";
then
# Emulation library used on NetBSD.
AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
- test "${with_sound}" = "ossaudio" && test -z "$LIBSOUND" && \
- AC_MSG_ERROR([ossaudio sound support requested but not found.])
- dnl FIXME? If we did find ossaudio, should we set with_sound=ossaudio?
+ test "${with_sound}" = "bsd-ossaudio" && test -z "$LIBSOUND" && \
+ AC_MSG_ERROR([bsd-ossaudio sound support requested but not found.])
+ dnl FIXME? If we did find ossaudio, should we set with_sound=bsd-ossaudio?
dnl Traditionally, we go on to check for alsa too. Does that make sense?
fi
AC_SUBST(LIBSOUND)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114082: * configure.ac (--with-sound): Rename ossaudio to bsd-ossaudio,,
Glenn Morris <=