Merge commit 'bca41545b371efc34e38d1fa8bb12dba8b614da0'

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

Merged-by: James Almer <jamrial@gmail.com>

diff --cc configure
index fee7d97cc358c9e4804b117f85922c01b3480c0c,9f84f880140c7cf128ce1ea914d1da14199a0cdd..1f7978049e19cb14bd679b7b7a953809cfdd6346
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -6661,22 -5090,8 +6673,11 @@@ expand_deps()
      unique $lib_deps
  }
  
 +#we have to remove gpl from the deps here as some code assumes all lib deps are libs
 +postproc_deps="$(filter_out 'gpl' $postproc_deps)"
 +
  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
  
  echo "install prefix            $prefix"