Merge commit '2dd464868c64fa21a6e3bd63ad364ff12999c7d0'

* commit '2dd464868c64fa21a6e3bd63ad364ff12999c7d0':
  configure: Move license checks directly after command line parsing

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

diff --cc configure
index c024717,acc74f2..8ec2afd
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -3536,22 -2765,19 +3536,38 @@@ for e in $env; d
      eval "export $e"
  done
  
 +# Mark specifically enabled, but normally autodetected libraries as requested.
 +for lib in $AUTODETECT_LIBS; do
 +    enabled $lib && request $lib
 +done
 +
 +# Enable platform codecs by default.
 +enable_weak audiotoolbox
 +
 +# Enable hwaccels by default.
 +enable_weak d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
 +enable_weak xlib
 +
 +enable_weak cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder
 +
  disabled logging && logfile=/dev/null
  
 -# Die early if licensing-related configure options are incompatible.
+ die_license_disabled() {
+     enabled $1 || { enabled $v && die "$v is $1 and --enable-$1 is not specified."; }
+ }
+ 
 -map "die_license_disabled gpl"      $EXTERNAL_LIBRARY_GPL_LIST
 -map "die_license_disabled nonfree"  $EXTERNAL_LIBRARY_NONFREE_LIST $HWACCEL_LIBRARY_NONFREE_LIST
 -map "die_license_disabled version3" $EXTERNAL_LIBRARY_VERSION3_LIST
++die_license_disabled_gpl() {
++    enabled $1 || { enabled $v && die "$v is incompatible with the gpl and --enable-$1 is not specified."; }
++}
++
++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
++map "die_license_disabled nonfree" $HWACCEL_LIBRARY_NONFREE_LIST
+ 
+ enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
+ 
  # Disable all the library-specific components if the library itself
  # is disabled, see AVCODEC_LIST and following _LIST variables.