[FFmpeg-cvslog] Merge commit 'bca41545b371efc34e38d1fa8bb12dba8b614da0'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Feb 11 22:59:18 2018 -0300| [8a15ad8a175cb97d6c1102b777f28e4d20846fec] | committer: James Almer

Merge commit 'bca41545b371efc34e38d1fa8bb12dba8b614da0'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a15ad8a175cb97d6c1102b777f28e4d20846fec
---

 configure | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index fee7d97cc3..1f7978049e 100755
--- a/configure
+++ b/configure
@@ -3795,6 +3795,18 @@ map "die_license_disabled nonfree" $HWACCEL_LIBRARY_NONFREE_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."
 
@@ -6666,17 +6678,6 @@ 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"


======================================================================

diff --cc configure
index fee7d97cc3,9f84f88014..1f7978049e
--- a/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"