| Message ID | k1nc-aqb2-wny@FreeBSD.org |
|---|---|
| State | New |
| Headers | show
Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:1286:0:0:0:0:0 with SMTP id 6-v6csp1856683jap; Sun, 23 Sep 2018 15:03:25 -0700 (PDT) X-Google-Smtp-Source: ACcGV60eyav9uuu4rz9PU/l7o5Kpew+IVny+6Eq86AecgfRIHt94EZrMfLx0NBlZUuSKHY2wN3+D X-Received: by 2002:adf:ae5a:: with SMTP id u26-v6mr6451137wrd.246.1537740205192; Sun, 23 Sep 2018 15:03:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537740205; cv=none; d=google.com; s=arc-20160816; b=ucOeMXwxx2EkAfJ1VnSTa2Qi8uWGHKZ7xYI0rhvyv8z6RDRrv4rATVUhgQYJwj13YJ 22FIJ3nmv4nTfiftrNYIWEjJVnZuO+wZjXrxIcpj5nxsHctJf1MRHOG4A779LMw7FfL4 pq1nNnCYMLLCZdIOum9dKWLjNufH2yX1Kie4for8mdGWUluHryx3BSqcK1RhmwZ9qVi3 nOR1cHNZ+8YgMlq1785Fl5oErtpdVV6Etst922s7dDSdD3uVU74o7kLtcgbu+5O0E8YM ADzO48mY0hnfd4w6FbBeVHOFXXsIb5S1TN6aOEaojNs6gVocsjyuV5OuF4DQb2bKFYSV JA7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=CPtM8Tv+RXF0CHW+2or3kyas1Am+6lCA1UaNWnk2fus=; b=ui7w2BiQc5218HOrqoS+7Vt5Hs858D3oEqIfJGaj5XZEQBgWJQF4oOufhGc9rB++hz B/Geli7K2W2/SQk5iaSjuuJ6EoloFQWNRmuj7FfvvaiCSroiO4PuCOFIW/q9WS9/LcFI kxWbyIybFQtuY93wtunaW8veUhovOSytKW84QS5LptiqJWyyw5WlGdTKcFkEsL02au1t QqHTOYCgDDdSUVmbH4SV/vEq8kiEZzu2JMdvIoekSmo/cOIFrMVk6vSkJLrPTL2/BGlQ 3/qt6UtmhmWUn6nArldmyXu/G5PMEf+Q1jOJ7jT7mjDqMGwQnZXfjwvle8SWSTIx4pVv VB/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h4-v6si3220512wrm.44.2018.09.23.15.03.24; Sun, 23 Sep 2018 15:03:25 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C80C68A695; Mon, 24 Sep 2018 01:03:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx2.freebsd.org (mx2.freebsd.org [8.8.178.116]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7332689E87 for <ffmpeg-devel@ffmpeg.org>; Sun, 23 Sep 2018 23:53:33 +0300 (EEST) Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx2.freebsd.org (Postfix) with ESMTPS id DFDBF80945; Sun, 23 Sep 2018 20:53:45 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 10227824FC; Sun, 23 Sep 2018 20:53:45 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1354) id 054BCD187; Sun, 23 Sep 2018 20:53:45 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Sep 2018 22:53:37 +0200 Message-ID: <k1nc-aqb2-wny@FreeBSD.org> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 24 Sep 2018 01:03:07 +0300 Subject: [FFmpeg-devel] [PATCH] configure: fix --disable-alsa after 247281e805 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <http://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <http://ffmpeg.org/pipermail/ffmpeg-devel/> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <http://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Jan =?utf-8?Q?Ekstr=C3=B6m?= <jeebjp@gmail.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> |
diff --git a/configure b/configure index 1946bcb69c..ea6fa2c6dc 100755 --- a/configure +++ b/configure @@ -6331,8 +6331,10 @@ else EOF fi -enabled alsa && check_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp || +if enabled alsa; then + check_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp || check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound +fi enabled libjack && require_pkg_config libjack jack jack/jack.h jack_port_get_latency_range
1 && 2 || 3 is implicitly grouped as { 1 && 2; } || 3 as both && and || have equal precedence and are evaluated with left associativity. Signed-off-by: Jan Beich <jbeich@FreeBSD.org> --- configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)