aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Constantino <wiiaboo@gmail.com>2017-03-15 22:47:58 +0000
committerJames Almer <jamrial@gmail.com>2017-03-15 19:53:12 -0300
commitb409d8d4a276490cd67255fd4230ea0954bd8c50 (patch)
treec5531462cec3a5b83bc2a16e94987fb060589c79
parentd96f6df3a649ab3276c7c854a1dfe23e89279d91 (diff)
downloadffmpeg-b409d8d4a276490cd67255fd4230ea0954bd8c50.tar.gz
configure: libnpp is always nonfree, even with LGPL
libnpp was erroneously grouped up with libfdk-aac and openssl to check if --enable-nonfree wasn't passed only with --enable-gpl in 9f28db47accb31bfec40a56dd2dc19ffd366a6be. The latter two are compatible with LGPL, libnpp is not. Signed-off-by: James Almer <jamrial@gmail.com>
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index e72ee297de..ecf67d5910 100755
--- a/configure
+++ b/configure
@@ -5173,7 +5173,8 @@ die_license_disabled_gpl() {
map "die_license_disabled gpl" $EXTERNAL_LIBRARY_GPL_LIST $EXTERNAL_LIBRARY_GPLV3_LIST
map "die_license_disabled version3" $EXTERNAL_LIBRARY_VERSION3_LIST $EXTERNAL_LIBRARY_GPLV3_LIST
-enabled gpl && map "die_license_disabled_gpl nonfree" $EXTERNAL_LIBRARY_NONFREE_LIST $HWACCEL_LIBRARY_NONFREE_LIST
+enabled gpl && map "die_license_disabled_gpl nonfree" $EXTERNAL_LIBRARY_NONFREE_LIST
+map "die_license_disabled nonfree" $HWACCEL_LIBRARY_NONFREE_LIST
enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }