Re: Deprecation message in Arch Linux.

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 414 bytes --]

Sven Joachim wrote:
> Perhaps
> Emacs' configure script should test for <alsa/asoundlib.h> first, and
> only try <asoundlib.h> if that fails?

Thanks for the suggestion. I looked into the history of this and the 
configure-time test apparently is for pre-1.0.0 alsa-lib, which Emacs no longer 
supports anyway. So I installed the attached obvious patch into master. Please 
give it a try, as I don't use alsa-lib.

[-- Attachment #2: 0001-Don-t-worry-about-pre-1.0.0-alsa-lib-include.patch --]
[-- Type: text/x-patch, Size: 2279 bytes --]

From fdccab473e1f95dae5ee0f07a4531dd4e05b22dd Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 28 Aug 2019 11:34:48 -0700
Subject: [PATCH] Don't worry about pre-1.0.0 alsa-lib include

Problem reported by Ergus in:
https://lists.gnu.org/r/emacs-devel/2019-08/msg00563.html
* configure.ac (ALSA_SUBDIR_INCLUDE): Do not define.
* src/sound.c: Assume ALSA_SUBDIR_INCLUDE.
---
 configure.ac | 20 --------------------
 src/sound.c  |  6 +-----
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6c83d61921..e39a438052 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1731,26 +1731,6 @@ AC_DEFUN
     ALSA_MODULES="alsa >= $ALSA_REQUIRED"
     EMACS_CHECK_MODULES([ALSA], [$ALSA_MODULES])
     if test $HAVE_ALSA = yes; then
-      SAVE_CFLAGS="$CFLAGS"
-      SAVE_LIBS="$LIBS"
-      CFLAGS="$ALSA_CFLAGS $CFLAGS"
-      LIBS="$ALSA_LIBS $LIBS"
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], [[snd_lib_error_set_handler (0);]])],
-                      emacs_alsa_normal=yes,
-	            emacs_alsa_normal=no)
-      if test "$emacs_alsa_normal" != yes; then
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <alsa/asoundlib.h>]],
-                       [[snd_lib_error_set_handler (0);]])],
-                       emacs_alsa_subdir=yes,
-	             emacs_alsa_subdir=no)
-        if test "$emacs_alsa_subdir" != yes; then
-          AC_MSG_ERROR([pkg-config found alsa, but it does not compile.  See config.log for error messages.])
-        fi
-        ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
-      fi
-
-      CFLAGS="$SAVE_CFLAGS"
-      LIBS="$SAVE_LIBS"
       LIBSOUND="$LIBSOUND $ALSA_LIBS"
       CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
       AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
diff --git a/src/sound.c b/src/sound.c
index 4ba826e82c..44d4cbc6d5 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -72,12 +72,8 @@ Copyright (C) 1998-1999, 2001-2019 Free Software Foundation, Inc.
 #include <soundcard.h>
 #endif
 #ifdef HAVE_ALSA
-#ifdef ALSA_SUBDIR_INCLUDE
 #include <alsa/asoundlib.h>
-#else
-#include <asoundlib.h>
-#endif /* ALSA_SUBDIR_INCLUDE */
-#endif /* HAVE_ALSA */
+#endif
 
 /* END: Non Windows Includes */
 
-- 
2.17.1