Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 285-296)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: admin/FOR-RELEASE: Update refcard section.

 * gnus--rel--5.10  (patch 102-104)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64

1 files changed, 6 insertions, 0 deletions

diff --git a/src/config.in b/src/config.in
index 9c1abadd283..106aeea920c 100644
--- a/src/config.in
+++ b/src/config.in
@@ -87,6 +87,9 @@ Boston, MA 02110-1301, USA.  */
    */
 #undef HAVE_ALLOCA_H
 
+/* Define to 1 if ALSA is available. */
+#undef HAVE_ALSA
+
 /* Define to 1 if you have the `bcmp' function. */
 #undef HAVE_BCMP
 
@@ -955,6 +958,9 @@ Boston, MA 02110-1301, USA.  */
 #ifdef HAVE_SOUNDCARD_H
 #define HAVE_SOUND 1
 #endif
+#ifdef HAVE_ALSA
+#define HAVE_SOUND 1
+#endif
 #endif /* __FreeBSD__ || __NetBSD__ || __linux__  */
 
 /* If using GNU, then support inline function declarations. */