From 63040dcdddda982726ef16aa728f1148847c8ac4 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 28 May 2012 15:44:11 +0200 Subject: [PATCH] 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 (cherry picked from commit d5a17d7f4d03d174c0cc6111fed07ebded0ac6f3) Signed-off-by: Michael Niedermayer --- configure | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 8718ff6f14..4e1a61196a 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