From patchwork Sat May 5 19:12:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 8795 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1327443jad; Sat, 5 May 2018 12:19:33 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrpEZ3pH4Kgyap9//SOjdq+tcZxy3QpAN52JvJ92nq7VUlA7r2UvGVtuY/xhZKBJ4BL75Wq X-Received: by 2002:adf:ec41:: with SMTP id w1-v6mr26731424wrn.211.1525547973056; Sat, 05 May 2018 12:19:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525547973; cv=none; d=google.com; s=arc-20160816; b=y5aMIWJ0UN/kk8rPJt5gWzy3SSb11/8EU2qSxB+d2ypGvGp/rE+fkvifcHe7OAIgfw 6A2gVe0oENmuKd0xz9sR/JR7IGQATT/uCoM+KzKbMwaixumapFozWSRtfFDla2bQTb4U gq1cMCVmNwpCOLKwow4vut8WvnHedYShj+sBs2yeKV9opqw+voSTjEVSRtBBIS15GM9Y rXMVdY3j5mQ94uczzoFD/xAUyFYRlOuCfXdT3DWiPOyLJfYukQo6ehCLq4DFyfPWh1L3 OyfzZSaxMbS3tKj0KskVom+10IrgRSIeeBMAkkihLLlBWmW5Wyhz2bCP8qC0fUbb7bx7 QS/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=RCUeo4moSXKEu5vTMYHSviE9smaOAhocn1TcuOsNUCk=; b=CzAoslWv9rEHL4WNoshN8J/ueENUdTZW4L0yK5bwaEs5a1IYuoJ1vFqlCUN5ZCBKht nAZOS67QuvoFgwVAdRDW3LrgJ3zU3zDWUsjfVHfcRjXcsNjYa/zVtBdPhvgJzICEo8+M Ctz2eswwXW4KkrzlMBeAD2bO7Q9Mzu51gystOnOnwjPrN+xy0UkYb0rJOBctvulNncAj A5BfwON7XBiMGnYgGwZWv+CHihtTIrfRg0Tirtee6GtVPW7Ii9tDbCuykY+hKLqUBSmJ 9L7uibGvwI3rXpfwnhhHVvMEkj0iOOJov/0g+e5qOJWIDqvm0lV/gMKOKCQZjHjJYetc hT+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=iHsf04uE; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v1-v6si16007522wrm.195.2018.05.05.12.19.32; Sat, 05 May 2018 12:19:33 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=iHsf04uE; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DC17168A56F; Sat, 5 May 2018 22:18:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f46.google.com (mail-lf0-f46.google.com [209.85.215.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96F5668A375 for ; Sat, 5 May 2018 22:18:50 +0300 (EEST) Received: by mail-lf0-f46.google.com with SMTP id o123-v6so35332536lfe.8 for ; Sat, 05 May 2018 12:19:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=5VpV/Hd0FT3MfTmxj48baW0+ipV3Njjh+k6nRQkFuq0=; b=iHsf04uE6wGnyDMZ+tAo30XaiglvQ0iRAC6g/xHLw3HNBeW3/sKn4WAb3sUf/7sBRg UQ5m2QJYkhCrOa5a/tximQjX7guCV8hamTD7Bff3/EielvDNanCbnsC181SVbwPUfwwv g43EcLc+M1j8/2oBa5lzNeMIOA1mab3yW4jIMobxwGcHBMuN56aiqFNPmAk5UGo2pDFn 7HbYTeI8suqFa2LiaXSEH4L9P+s3W3D0p5yTcGyLYuYkIP6+SoFo4NMLSAusTeq1dcPy gcpId/XbsbxFojmuB4a52EWrcR84vGmyn6PSW/urxRdb91fz1Jsx71xr7efHCZ8BZrIV 7G5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=5VpV/Hd0FT3MfTmxj48baW0+ipV3Njjh+k6nRQkFuq0=; b=Nd7hEYYa5wyQWOfhYvsazo1/SVqm7PMeTnVyyxTRbt9GuXx0+H7xI3pbK+r561mMBh WZOdfsLSvlksEmioZstzxuYr8FDxZOaTAHqzPaLvWQqJQ4cjwkMX2SWbNlghRchCAaO/ NyqXd/9dKICE7U9V3IY3Dok3Cy2Zyp14S5XCFM3dkxEdta1x2jeuynkwMd1I9e7S32TH OJvSoQ6pJI2hYzXkHvwwqcYCot1D6PmrsDut7tNTze49BThCuIAo5qzXpnIGtSxtETRv R5Cv3LQJ11AnNOxG5guFyn96BUzaeLQSZvryGVRDmTsEDHuwAuj3V/d6kgJ1AmgTzmDg UeWA== X-Gm-Message-State: ALQs6tB8imiOhcOo0J4gzsj4kgQEysvzVz1CtCg3CIg8C829ywLHUXxj W37+JIM3rlOBChuPXZascG4Kp4yL X-Received: by 2002:a19:d307:: with SMTP id k7-v6mr20944458lfg.104.1525547567075; Sat, 05 May 2018 12:12:47 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id a189-v6sm3968899lfa.6.2018.05.05.12.12.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 05 May 2018 12:12:45 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 May 2018 22:12:44 +0300 Message-Id: <20180505191244.4414-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] configure: add pkg-config check for zlib X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It exists, so why not use it? Helps one get rid of additional search path related flags in addition to PKG_CONFIG_{PATH,LIBDIR} when utilizing a cross-prefix separate from the sysroot. --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index f78853cc6c..2d99c8ea85 100755 --- a/configure +++ b/configure @@ -5933,7 +5933,8 @@ if ! disabled pthreads && ! enabled w32threads && ! enabled os2threads; then fi fi -enabled zlib && check_lib zlib zlib.h zlibVersion -lz +enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion || + check_lib zlib zlib.h zlibVersion -lz; } enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2 enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma