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.

diff --git a/ChangeLog b/ChangeLog
index 4fbb293747dd58bbadc91191a52a021e31fa7a35..1a67294ea9a2690fce4629ceb661890242101d0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-11  Glenn Morris  <rgm@gnu.org>
+
+       * configure.ac (DEFAULT_SOUND_DEVICE): New definition.
+
 2012-07-10  Paul Eggert  <eggert@cs.ucla.edu>
 
        Remove "#define unix" that is no longer needed (Bug#11905).

diff --git a/configure.ac b/configure.ac
index 028706af8e59406c4ce351df66d8b6fd353e6743..a05f4f860a8449b876b5198455455fbc235154bb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3145,6 +3145,16 @@ case $opsys in
   ;;
 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

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c98c0b356da0c61eeb49f85c2fecc83f5b62019..be42db2468ad8ce77c125bd5ff25e85ffb9ac33f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-11  Glenn Morris  <rgm@gnu.org>
+
+       * sound.c (DEFAULT_SOUND_DEVICE) [!WINDOWSNT]:
+       * s/netbsd.h (DEFAULT_SOUND_DEVICE): Let configure set it.
+
 2012-07-10  Paul Eggert  <eggert@cs.ucla.edu>
 
        Remove "#define unix" that is no longer needed (Bug#11905).

diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 23e72541920614b0452678a9725b6e71e785147c..80b4442af56efd71ff08ea98bd67c3f2102120ea 100644 (file)
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -21,8 +21,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Get most of the stuff from bsd-common.  */
 #include "bsd-common.h"
 
-#define DEFAULT_SOUND_DEVICE "/dev/audio"
-
 /* Greg A. Woods <woods@weird.com> 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.  */

diff --git a/src/sound.c b/src/sound.c
index adeb3c47f0fc44294f52df271a068d7d677a8031..3773047827b2590a893e829dbc86ea593b11621d 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -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 @@ enum sound_attr
 /* 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 @@ vox_open (struct sound_device *sd)
 {
   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 @@ vox_init (struct sound_device *sd)
   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