aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2014-09-13 10:10:40 +0300
committerEli Zaretskii2014-09-13 10:10:40 +0300
commite868e853a85fb4466ab045962a269db31760f354 (patch)
tree2870bb55e9e89c4c601e1351e35d31933ab5335b
parentc4ea7c96121ec50db8dbfcb4bfe961f23760e3f9 (diff)
downloademacs-e868e853a85fb4466ab045962a269db31760f354.tar.gz
emacs-e868e853a85fb4466ab045962a269db31760f354.zip
Resurrect sound support on MS-Windows that was lost in transition.
configure.ac (HAVE_SOUND): Check for mmsystem.h header that defines the sound stuff on MS-Windows. (Bug#18463)
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e0090a45ced..b1951aa6c71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12014-09-13 Eli Zaretskii <eliz@gnu.org>
2
3 * configure.ac (HAVE_SOUND): Check for mmsystem.h header that
4 defines the sound stuff on MS-Windows. (Bug#18463)
5
12014-08-22 Ken Brown <kbrown@cornell.edu> 62014-08-22 Ken Brown <kbrown@cornell.edu>
2 7
3 * configure.ac (HAVE_XPM): Explain the use of CPPFLAGS in the 8 * configure.ac (HAVE_XPM): Explain the use of CPPFLAGS in the
diff --git a/configure.ac b/configure.ac
index d4e1d65ff56..f05c14a319c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1398,7 +1398,7 @@ AC_DEFUN([PKG_CHECK_MODULES], [
1398HAVE_SOUND=no 1398HAVE_SOUND=no
1399if test "${with_sound}" != "no"; then 1399if test "${with_sound}" != "no"; then
1400 # Sound support for GNU/Linux, the free BSDs, and MinGW. 1400 # Sound support for GNU/Linux, the free BSDs, and MinGW.
1401 AC_CHECK_HEADERS([machine/soundcard.h sys/soundcard.h soundcard.h], 1401 AC_CHECK_HEADERS([machine/soundcard.h sys/soundcard.h soundcard.h mmsystem.h],
1402 have_sound_header=yes, [], [ 1402 have_sound_header=yes, [], [
1403 #ifdef __MINGW32__ 1403 #ifdef __MINGW32__
1404 #define WIN32_LEAN_AND_MEAN 1404 #define WIN32_LEAN_AND_MEAN