generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: fix the wording for gpl incompatible licenses warnings

Browse Source 
calling the 4 clause BSD license non free is quite a stretch ;)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d5a17d7f4d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-05-28 15:44:11 +02:00
parent 1e78d75d6a
commit 63040dcddd
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -2853,6 +2853,10 @@ die_license_disabled() {
enabled $1 || { enabled $2 && die "$2 is $1 and --enable-$1 is not specified."; } 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 libcdio
die_license_disabled gpl libutvideo die_license_disabled gpl libutvideo
die_license_disabled gpl libx264 die_license_disabled gpl libx264
@@ -2862,7 +2866,7 @@ die_license_disabled gpl x11grab
die_license_disabled nonfree libaacplus die_license_disabled nonfree libaacplus
die_license_disabled nonfree libfaac 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_amrnb
die_license_disabled version3 libopencore_amrwb die_license_disabled version3 libopencore_amrwb