diff options
author | Diego Biurrun <diego@biurrun.de> | 2009-05-06 12:10:27 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2009-05-06 12:10:27 +0000 |
commit | d8ef221893116c8eb5052602878480e2709e33ec (patch) | |
tree | bd3167ee93cc3ffa0d3171acd5d6566d82864ede /configure | |
parent | 8d003e22caf05981473c5048184a062537be496c (diff) |
Merge factorization of license check code from trunk.
Originally committed as revision 18756 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 29 |
1 files changed, 13 insertions, 16 deletions
@@ -1682,23 +1682,20 @@ EOF fi -if ! enabled gpl; then - die_gpl_disabled(){ - name=$1 - shift - enabled_any $@ && die "$name is under GPL and --enable-gpl is not specified." - } - die_gpl_disabled "The Postprocessing code" postproc - die_gpl_disabled "libx264" libx264 - die_gpl_disabled "libxvidcore" libxvid - die_gpl_disabled "FAAD2" libfaad2 - die_gpl_disabled "The X11 grabber" x11grab - die_gpl_disabled "The software scaler" swscale -fi +die_license_disabled() { + enabled $1 || enabled $2 && die "$2 is $1 and --enable-$1 is not specified." +} + +die_license_disabled gpl libfaad2 +die_license_disabled gpl libx264 +die_license_disabled gpl libxvid +die_license_disabled gpl postproc +die_license_disabled gpl swscale +die_license_disabled gpl x11grab + +die_license_disabled nonfree libamr_nb +die_license_disabled nonfree libamr_wb -if ! enabled nonfree && enabled_any libamr_nb libamr_wb; then - die "libamr is nonfree and --enable-nonfree is not specified." -fi check_deps $ARCH_EXT_LIST |