generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Factorize GPL and nonfree license checks into a common function.

Browse Source 
Originally committed as revision 18714 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
2009-04-29 15:32:40 +00:00
parent d647ed789f
commit 2184c6f7af
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
configure vendored
View File

@@ -1736,22 +1736,19 @@ EOF
fi fi
if ! enabled gpl; then die_license_disabled() {
die_gpl_disabled(){ enabled $1 || enabled $2 && die "$2 is $1 and --enable-$1 is not specified."
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
fi
if ! enabled nonfree && enabled_any libamr_nb libamr_wb; then die_license_disabled gpl libfaad2
die "libamr is nonfree and --enable-nonfree is not specified." die_license_disabled gpl libx264
fi die_license_disabled gpl libxvid
die_license_disabled gpl postproc
die_license_disabled gpl x11grab
die_license_disabled nonfree libamr_nb
die_license_disabled nonfree libamr_wb
check_deps $ARCH_EXT_LIST check_deps $ARCH_EXT_LIST