aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-28 15:44:11 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-28 15:49:12 +0200
commitd5a17d7f4d03d174c0cc6111fed07ebded0ac6f3 (patch)
tree1a601a4e5900f5f7bcdc06cf6688aa0c023b177a
parentf997ac1c8bc2124c4c6bf33ad17bc6f6cca0f84e (diff)
downloadffmpeg-d5a17d7f4d03d174c0cc6111fed07ebded0ac6f3.tar.gz
configure: fix the wording for gpl incompatible licenses warnings
calling the 4 clause BSD license non free is quite a stretch ;) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure6
1 files changed, 5 insertions, 1 deletions
diff --git a/configure b/configure
index a4aef8dcf9..4a4f659817 100755
--- a/configure
+++ b/configure
@@ -2853,6 +2853,10 @@ die_license_disabled() {
enabled $1 || { enabled $2 && die "$2 is $1 and --enable-$1 is not specified."; }
}
+die_license_disabled_gpl() {
+ enabled $1 || { enabled $2 && die "$2 is incompatible with the gpl and --enable-$1 is not specified."; }
+}
+
die_license_disabled gpl libcdio
die_license_disabled gpl libutvideo
die_license_disabled gpl libx264
@@ -2862,7 +2866,7 @@ die_license_disabled gpl x11grab
die_license_disabled nonfree libaacplus
die_license_disabled nonfree libfaac
-enabled gpl && die_license_disabled nonfree openssl
+enabled gpl && die_license_disabled_gpl nonfree openssl
die_license_disabled version3 libopencore_amrnb
die_license_disabled version3 libopencore_amrwb