diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 7 insertions, 3 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-09-27 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * configure.ac [CYGWIN]: Enable sound support. | ||
| 4 | |||
| 1 | 2014-09-25 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2014-09-25 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | * configure.ac (MAKEINFO): Allow 'makeinfo' to be called 'texi2any'. | 7 | * configure.ac (MAKEINFO): Allow 'makeinfo' to be called 'texi2any'. |
diff --git a/configure.ac b/configure.ac index 4d9cc0d0274..5fd49280dd4 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -254,7 +254,7 @@ AC_ARG_WITH([mailhost],[AS_HELP_STRING([--with-mailhost=HOSTNAME], | |||
| 254 | 254 | ||
| 255 | AC_ARG_WITH([sound],[AS_HELP_STRING([--with-sound=VALUE], | 255 | AC_ARG_WITH([sound],[AS_HELP_STRING([--with-sound=VALUE], |
| 256 | [compile with sound support (VALUE one of: yes, alsa, oss, bsd-ossaudio, no; | 256 | [compile with sound support (VALUE one of: yes, alsa, oss, bsd-ossaudio, no; |
| 257 | default yes). Only for GNU/Linux, FreeBSD, NetBSD, MinGW.])], | 257 | default yes). Only for GNU/Linux, FreeBSD, NetBSD, MinGW, Cygwin.])], |
| 258 | [ case "${withval}" in | 258 | [ case "${withval}" in |
| 259 | yes|no|alsa|oss|bsd-ossaudio) val=$withval ;; | 259 | yes|no|alsa|oss|bsd-ossaudio) val=$withval ;; |
| 260 | *) AC_MSG_ERROR([`--with-sound=$withval' is invalid; | 260 | *) AC_MSG_ERROR([`--with-sound=$withval' is invalid; |
| @@ -1442,7 +1442,7 @@ AC_DEFUN([EMACS_CHECK_MODULES], | |||
| 1442 | 1442 | ||
| 1443 | HAVE_SOUND=no | 1443 | HAVE_SOUND=no |
| 1444 | if test "${with_sound}" != "no"; then | 1444 | if test "${with_sound}" != "no"; then |
| 1445 | # Sound support for GNU/Linux, the free BSDs, and MinGW. | 1445 | # Sound support for GNU/Linux, the free BSDs, MinGW, and Cygwin. |
| 1446 | AC_CHECK_HEADERS([machine/soundcard.h sys/soundcard.h soundcard.h mmsystem.h], | 1446 | AC_CHECK_HEADERS([machine/soundcard.h sys/soundcard.h soundcard.h mmsystem.h], |
| 1447 | have_sound_header=yes, [], [ | 1447 | have_sound_header=yes, [], [ |
| 1448 | #ifdef __MINGW32__ | 1448 | #ifdef __MINGW32__ |
| @@ -1505,7 +1505,7 @@ if test "${with_sound}" != "no"; then | |||
| 1505 | case "$opsys" in | 1505 | case "$opsys" in |
| 1506 | dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__ | 1506 | dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__ |
| 1507 | dnl Adjust the --with-sound help text if you change this. | 1507 | dnl Adjust the --with-sound help text if you change this. |
| 1508 | gnu-linux|freebsd|netbsd|mingw32) | 1508 | gnu-linux|freebsd|netbsd|mingw32|cygwin) |
| 1509 | AC_DEFINE(HAVE_SOUND, 1, [Define to 1 if you have sound support.]) | 1509 | AC_DEFINE(HAVE_SOUND, 1, [Define to 1 if you have sound support.]) |
| 1510 | HAVE_SOUND=yes | 1510 | HAVE_SOUND=yes |
| 1511 | ;; | 1511 | ;; |