diff options
author | James Almer <jamrial@gmail.com> | 2017-03-31 14:39:10 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-03-31 14:39:10 -0300 |
commit | 0ad9aff0227a841df462134510614af1bf044874 (patch) | |
tree | 5c25b128b0f74506668525c64f6693bf7985403d | |
parent | 8d50dd976d29884463993b75dff1cc813c089b3a (diff) | |
parent | 2dd464868c64fa21a6e3bd63ad364ff12999c7d0 (diff) | |
download | ffmpeg-0ad9aff0227a841df462134510614af1bf044874.tar.gz |
Merge commit '2dd464868c64fa21a6e3bd63ad364ff12999c7d0'
* commit '2dd464868c64fa21a6e3bd63ad364ff12999c7d0':
configure: Move license checks directly after command line parsing
Merged-by: James Almer <jamrial@gmail.com>
-rwxr-xr-x | configure | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -3552,6 +3552,22 @@ enable_weak cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder disabled logging && logfile=/dev/null +die_license_disabled() { + enabled $1 || { enabled $v && die "$v is $1 and --enable-$1 is not specified."; } +} + +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. @@ -5161,22 +5177,6 @@ EOF exit 1 fi -die_license_disabled() { - enabled $1 || { enabled $v && die "$v is $1 and --enable-$1 is not specified."; } -} - -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; } - disabled optimizations || check_cflags -fomit-frame-pointer enable_weak_pic() { |