From patchwork Fri Feb 9 10:06:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 7532 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp575829jai; Fri, 9 Feb 2018 02:07:10 -0800 (PST) X-Google-Smtp-Source: AH8x227SUQabxaKhMK9Wnn72xM/ir99X6X56g2eLVEYLwU4ak/nWPAtKxm+s/PUMJIGq7wkBgWpV X-Received: by 10.28.20.206 with SMTP id 197mr1422060wmu.19.1518170829950; Fri, 09 Feb 2018 02:07:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518170829; cv=none; d=google.com; s=arc-20160816; b=NQF0UntPFyFteLmuxfv5HF1P2BgRhPxlyAnF2kgNMaCIUTVP+UDnXpI8v7dDA5j4VM 26LiGuFK/TpsqC7toArFIiJYEwIrzwxeHhqARucN4WnX8QytAEwYen+GEkpAyz5ih3wY DOqgFulUQShN13gWAvl6lMc/NTF+qv8JygZTz37n53INq8vJ/ih2NMyRdQ689mbgPlTK 6XQM9oOlDh1YBy+vascBW52csvccpAW6B0tZI5aIPhxvDNtb29JGDXGlkGfPxl+O+3C9 3zYnOYcTuUrTUQS/hRSBXAwWSyf8DeduPfG5c0uuZXZSez9RqYURHsj3oBSrhfP2mlmf HiAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=3qHNdskVR5Lu2Y8g0G/TRhbMuACy19eQkP0tQhxD48M=; b=UXyRh5EuSj7flp5FmwwpLStpjj/+C2jbmz6KklkQaUzQMf2kEgj9l5CAQRNIerd00s dAz873zcPL2H/Zye7mJg3Q0WzzrEOHe/CgxrY/QnotP3gjZS+O1BABNAfMVB0qv6R9dH DpdOzu1yR1x2JjNH0DdLp6IN14DKAu571ThxGmdLx72zkIuacQNE9sHFyOb/vK+jpC/n 8Q7nyVBz7gXqUxSR3buVeS+d0VV9WNxLnl5yNgF+9sXs4aDRPqtLLIDs8Er+gUnJoa2O JUFD2RbeVpjxgY/tXiuYGIRry1kiD28VBECKVxLaRrP5EHCEgKXYmGY0hWdcI7Px5M/H A1GQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ithCQNZW; 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 s3si1270787wmf.264.2018.02.09.02.07.09; Fri, 09 Feb 2018 02:07:09 -0800 (PST) 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=ithCQNZW; 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 6BE1268990D; Fri, 9 Feb 2018 12:06:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f177.google.com (mail-io0-f177.google.com [209.85.223.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1C28680877 for ; Fri, 9 Feb 2018 12:06:51 +0200 (EET) Received: by mail-io0-f177.google.com with SMTP id l17so9095881ioc.3 for ; Fri, 09 Feb 2018 02:07:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=dFWxOvvCXZ0ElWhKAzJkcxNtysNG6KOR1gyqmPLCqz0=; b=ithCQNZWunVFVQ2dCUphm6H3A/AZ1FXE6JXcMIrgHKdS3vaMMUlf5OuuWd3QBbaV79 EflE7p35DU4BwVg/Fgt6+nD7Dfh4ptKb23Z3cajXX/MIxqy9CaTCTed48ewcAl6Gm1ks SAFQlcxRNiuZsuE8Hp+PkD80xJ02wHKC8lobr1VF+nFnXHtX6+mh/lnuaRXmMbDbVG0M Te+2JOW+ZpjaHj16+hrvOxq3q4qRaNbfQzJcS0yY+Ds9k+Sw/K95zXQivOMNnZGV3oz/ bZCgQ7X25h4yE7HIYlRP/I7hIoQ5F81Jw7qWYBM0mkT8n8l7KTA+W3udsfqhMtZF2Uz3 Bmhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=dFWxOvvCXZ0ElWhKAzJkcxNtysNG6KOR1gyqmPLCqz0=; b=pqXCAE2civGDVGtXn+vbGInfJuwrZAkHXcZhxRnGJIOGfLfG4o+qlAYyITmDv7kKDN +xf23WvdvcUmI5BzGlz2c+8XWBp16tP21nJxAFsWLPlbkDJRtMgEAlKb7JUgTl96PqSK DCDHpk1i5CgvYfkwu/E9JcvZ9o9ojQCZ7w2yyibZZVdYuZHtPNLChDbPU8D6Vlweewma OxQUkxQxj4++inu9gy7nt902dCOzVooqSTHg//LQ2OjvhAjhRSGvswbCnBlKtemIhX3B zVYYHwD4dzL0W+K6oJde2pGjem+MtTJOaUDAUO/9sldb0XcbcwA4FiiJPpKwYLIsi+Lt sqPg== X-Gm-Message-State: APf1xPBHItP7DLBDZqQvIGHFJOSxmNscIMKyXoHkHPgAwq+9wChb0YuO hzsPQtnPZ0wVAi3UNx8on9ZMUDpSdv/LTgRilHKxgw== X-Received: by 10.107.53.22 with SMTP id c22mr2433233ioa.189.1518170819625; Fri, 09 Feb 2018 02:06:59 -0800 (PST) MIME-Version: 1.0 Received: by 10.2.130.68 with HTTP; Fri, 9 Feb 2018 02:06:38 -0800 (PST) From: Carl Eugen Hoyos Date: Fri, 9 Feb 2018 11:06:38 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]configure: Improve the wording of the license failure 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! It was reported on the user mailing list that "libvmaf is version3 and --enable-version3 is not specified." is unclear, attached patch tries to slightly improve the sentence. Please comment, Carl Eugen From c0170122c42f9837dc188296e6d66ad37258febe Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Fri, 9 Feb 2018 11:04:03 +0100 Subject: [PATCH] configure: Improve the wording of the license failure message. --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 2711382..3883057 100755 --- a/configure +++ b/configure @@ -3767,11 +3767,11 @@ EOF fi die_license_disabled() { - enabled $1 || { enabled $v && die "$v is $1 and --enable-$1 is not specified."; } + enabled $1 || { enabled $v && die "$v requires $1 for license reasons but --enable-$1 is not specified."; } } die_license_disabled_gpl() { - enabled $1 || { enabled $v && die "$v is incompatible with the gpl and --enable-$1 is not specified."; } + enabled $1 || { enabled $v && die "$v is incompatible with the gpl but --enable-$1 is not specified."; } } map "die_license_disabled gpl" $EXTERNAL_LIBRARY_GPL_LIST $EXTERNAL_LIBRARY_GPLV3_LIST -- 1.7.10.4