Module: libav Branch: master Commit: bca41545b371efc34e38d1fa8bb12dba8b614da0
Author: Diego Biurrun <[email protected]> Committer: Diego Biurrun <[email protected]> Date: Mon Feb 5 13:53:49 2018 +0100 configure: Group code that sets the license string with licensing checks This also moves the setting of the licensing string out of a block that is skipped when quiet operation is requested. --- configure | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 593064f..9f84f88 100755 --- a/configure +++ b/configure @@ -2881,6 +2881,18 @@ map "die_license_disabled version3" $EXTERNAL_LIBRARY_VERSION3_LIST 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 && die "GnuTLS and OpenSSL must not be enabled at the same time." @@ -5170,17 +5182,6 @@ if test -n "$ignore_tests"; then echo fi -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 - echo "License: $license" fi # test "$quiet" != "yes" _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
