RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'bca41545b371efc34e38d1fa8bb12dba8b614da0' 

* commit 'bca41545b371efc34e38d1fa8bb12dba8b614da0':
  configure: Group code that sets the license string with licensing checks

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-02-11 22:59:18 -03:00
parent 0a320f7e7a bca41545b3
commit 8a15ad8a17
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure vendored
View File

@ -3795,6 +3795,18 @@ map "die_license_disabled nonfree" $HWACCEL_LIBRARY_NONFREE_LIST
enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; } enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
if enabled nonfree; then
license="nonfree and unredistributable"
elif enabled gplv3; then
license="GPL version 3 or later"
elif enabled lgplv3; then
license="LGPL version 3 or later"
elif enabled gpl; then
license="GPL version 2 or later"
else
license="LGPL version 2.1 or later"
fi
enabled_all gnutls openssl && enabled_all gnutls openssl &&
die "GnuTLS and OpenSSL must not be enabled at the same time." die "GnuTLS and OpenSSL must not be enabled at the same time."
@ -6666,17 +6678,6 @@ postproc_deps="$(filter_out 'gpl' $postproc_deps)"
map 'expand_deps $v' $LIBRARY_LIST map 'expand_deps $v' $LIBRARY_LIST
license="LGPL version 2.1 or later"
if enabled nonfree; then
license="nonfree and unredistributable"
elif enabled gplv3; then
license="GPL version 3 or later"
elif enabled lgplv3; then
license="LGPL version 3 or later"
elif enabled gpl; then
license="GPL version 2 or later"
fi
if test "$quiet" != "yes"; then if test "$quiet" != "yes"; then
echo "install prefix $prefix" echo "install prefix $prefix"