From: Paul Eggert <eggert@cs.ucla.edu>
To: Sven Joachim <svenjoac@gmx.de>
Cc: Ergus <spacibba@aol.com>, Emacs developers <emacs-devel@gnu.org>
Subject: Re: Deprecation message in Arch Linux.
Date: Wed, 28 Aug 2019 11:38:51 -0700 [thread overview]
Message-ID: <75513d9a-6e54-af19-8c39-15879d81eec0@cs.ucla.edu> (raw)
In-Reply-To: <87woexjia8.fsf@turtle.gmx.de>
[-- 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
next prev parent reply other threads:[~2019-08-28 18:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-28 9:41 Deprecation message in Arch Linux Ergus
2019-08-28 17:19 ` Paul Eggert
2019-08-28 17:45 ` Sven Joachim
2019-08-28 18:38 ` Paul Eggert [this message]
2019-08-28 18:49 ` Eli Zaretskii
2019-08-28 19:08 ` Sven Joachim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=75513d9a-6e54-af19-8c39-15879d81eec0@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=spacibba@aol.com \
--cc=svenjoac@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.