From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Deprecation message in Arch Linux. Date: Wed, 28 Aug 2019 11:38:51 -0700 Organization: UCLA Computer Science Department Message-ID: <75513d9a-6e54-af19-8c39-15879d81eec0@cs.ucla.edu> References: <20190828094105.h4n4l3dan6n5i7qy@Ergus> <87woexjia8.fsf@turtle.gmx.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------A6EE1CB3B9B59D6C42FCCC9C" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="243605"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 Cc: Ergus , Emacs developers To: Sven Joachim Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 28 20:39:47 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1i32rD-0011Dk-Bh for ged-emacs-devel@m.gmane.org; Wed, 28 Aug 2019 20:39:47 +0200 Original-Received: from localhost ([::1]:39716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i32rB-0000u6-PC for ged-emacs-devel@m.gmane.org; Wed, 28 Aug 2019 14:39:45 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:32969) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i32qQ-0000tz-UO for emacs-devel@gnu.org; Wed, 28 Aug 2019 14:39:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i32qP-00020z-OT for emacs-devel@gnu.org; Wed, 28 Aug 2019 14:38:58 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:57468) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i32qP-0001yE-Df for emacs-devel@gnu.org; Wed, 28 Aug 2019 14:38:57 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id CDBD216005F; Wed, 28 Aug 2019 11:38:55 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 2-aXmQx3T5UA; Wed, 28 Aug 2019 11:38:52 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 29E0B1600EC; Wed, 28 Aug 2019 11:38:52 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id RHi8x6J0ch18; Wed, 28 Aug 2019 11:38:52 -0700 (PDT) Original-Received: from [192.168.1.9] (cpe-23-242-74-103.socal.res.rr.com [23.242.74.103]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 00BBD160062; Wed, 28 Aug 2019 11:38:51 -0700 (PDT) In-Reply-To: <87woexjia8.fsf@turtle.gmx.de> Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:239651 Archived-At: This is a multi-part message in MIME format. --------------A6EE1CB3B9B59D6C42FCCC9C Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sven Joachim wrote: > Perhaps > Emacs' configure script should test for first, and > only try 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. --------------A6EE1CB3B9B59D6C42FCCC9C Content-Type: text/x-patch; name="0001-Don-t-worry-about-pre-1.0.0-alsa-lib-include.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Don-t-worry-about-pre-1.0.0-alsa-lib-include.patch" >From fdccab473e1f95dae5ee0f07a4531dd4e05b22dd Mon Sep 17 00:00:00 2001 From: Paul Eggert 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 ]], [[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 ]], - [[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 #endif #ifdef HAVE_ALSA -#ifdef ALSA_SUBDIR_INCLUDE #include -#else -#include -#endif /* ALSA_SUBDIR_INCLUDE */ -#endif /* HAVE_ALSA */ +#endif /* END: Non Windows Includes */ -- 2.17.1 --------------A6EE1CB3B9B59D6C42FCCC9C--