[Emacs-diffs] /srv/bzr/emacs/trunk r109008: Let configure set DEFAULT_SOUND_DEVICE

[Glenn Morris]

------------------------------------------------------------
revno: 109008
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-10 22:16:25 -0400
message:
  Let configure set DEFAULT_SOUND_DEVICE
  
  * configure.ac (DEFAULT_SOUND_DEVICE): New definition.
  
  * src/sound.c (DEFAULT_SOUND_DEVICE) [!WINDOWSNT]:
  * src/s/netbsd.h (DEFAULT_SOUND_DEVICE): Let configure set it.
modified:
  ChangeLog
  configure.ac
  src/ChangeLog
  src/s/netbsd.h
  src/sound.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-11 00:01:21 +0000
+++ b/ChangeLog 2012-07-11 02:16:25 +0000
@@ -1,3 +1,7 @@
+2012-07-11  Glenn Morris  <address@hidden>
+
+       * configure.ac (DEFAULT_SOUND_DEVICE): New definition.
+
 2012-07-10  Paul Eggert  <address@hidden>
 
        Remove "#define unix" that is no longer needed (Bug#11905).

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-10 07:37:17 +0000
+++ b/configure.ac      2012-07-11 02:16:25 +0000
@@ -3145,6 +3145,16 @@
   ;;
 esac
 
+dnl FIXME Surely we can test for this rather than hard-code it.
+case $opsys in
+  netbsd | openbsd) sound_device="/dev/audio" ;;
+  *) sound_device="/dev/dsp" ;;
+esac
+
+dnl Used in sound.c
+AC_DEFINE_UNQUOTED(DEFAULT_SOUND_DEVICE, "$sound_device",
+  [Name of the default sound device.])
+
 dnl Used in vm-limit.c
 AH_TEMPLATE(DATA_START, [Address of the start of the data segment.])
 dnl Used in lisp.h, emacs.c, mem-limits.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-11 00:01:21 +0000
+++ b/src/ChangeLog     2012-07-11 02:16:25 +0000
@@ -1,3 +1,8 @@
+2012-07-11  Glenn Morris  <address@hidden>
+
+       * sound.c (DEFAULT_SOUND_DEVICE) [!WINDOWSNT]:
+       * s/netbsd.h (DEFAULT_SOUND_DEVICE): Let configure set it.
+
 2012-07-10  Paul Eggert  <address@hidden>
 
        Remove "#define unix" that is no longer needed (Bug#11905).

=== modified file 'src/s/netbsd.h'
--- a/src/s/netbsd.h    2012-07-10 07:37:17 +0000
+++ b/src/s/netbsd.h    2012-07-11 02:16:25 +0000
@@ -21,8 +21,6 @@
 /* Get most of the stuff from bsd-common.  */
 #include "bsd-common.h"
 
-#define DEFAULT_SOUND_DEVICE "/dev/audio"
-
 /* Greg A. Woods <address@hidden> says we must include signal.h
    before syssignal.h is included, to work around interface conflicts
    that are handled with CPP __RENAME() macro in signal.h.  */

=== modified file 'src/sound.c'
--- a/src/sound.c       2012-07-05 18:35:48 +0000
+++ b/src/sound.c       2012-07-11 02:16:25 +0000
@@ -1,5 +1,6 @@
 /* sound.c -- sound support.
-   Copyright (C) 1998-1999, 2001-2012 Free Software Foundation, Inc.
+
+Copyright (C) 1998-1999, 2001-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -114,11 +115,6 @@
 /* BEGIN: Non Windows Definitions */
 #ifndef WINDOWSNT
 
-#ifndef DEFAULT_SOUND_DEVICE
-#define DEFAULT_SOUND_DEVICE "/dev/dsp"
-#endif
-
-
 /* Structure forward declarations.  */
 
 struct sound;
@@ -714,7 +710,7 @@
 {
   const char *file;
 
-  /* Open the sound device.  Default is /dev/dsp.  */
+  /* Open the sound device (eg /dev/dsp).  */
   if (sd->file)
     file = sd->file;
   else
@@ -860,7 +856,7 @@
   const char *file;
   int fd;
 
-  /* Open the sound device.  Default is /dev/dsp.  */
+  /* Open the sound device (eg /dev/dsp).  */
   if (sd->file)
     file = sd->file;
   else