[FFmpeg-devel] configure: Improve the wording of the license failure

Submitted by Carl Eugen Hoyos on Feb. 9, 2018, 10:06 a.m.

Details

Message ID CAB0OVGpidVi3O5GBYobMW5O8EWxmGuVfMbFpjfexER+n_fN87w@mail.gmail.com
State New
Headers show

Commit Message

Carl Eugen Hoyos Feb. 9, 2018, 10:06 a.m.
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

Comments

Lou Logan Feb. 9, 2018, 6:48 p.m.
On Fri, Feb 9, 2018, at 1:06 AM, Carl Eugen Hoyos wrote:
> 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
[...]

A few alternatives to consider:

> 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."; }

"$v requires --enable-$1." 
 
> 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."; }

"$v is incompatible with the GPL. --enable-$1 is required."
or
"$v is incompatible with --enable-gpl. --enable-$1 is required."
or
"$v is incompatible with the GPL. Add --enable-$1 or remove --enable-gpl."

Patch hide | download patch | download mbox

From c0170122c42f9837dc188296e6d66ad37258febe Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
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