From: Elvis Presley <[email protected]>
Signed-off-by: Elvis Presley <[email protected]>
---
configure | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/configure b/configure
index e26124e..87c9cef 100755
--- a/configure
+++ b/configure
@@ -76,6 +76,7 @@ Configuration options:
--enable-shared build shared libraries [no]
--enable-gpl allow use of GPL code, the resulting libs
and binaries will be under GPL [no]
+ --enable-version2 force GPL version 2 [no]
--enable-version3 upgrade (L)GPL to version 3 [no]
--enable-nonfree allow use of nonfree code, the resulting libs
and binaries will be unredistributable [no]
@@ -972,6 +973,7 @@ CONFIG_LIST="
thumb
vaapi
vdpau
+ version2
version3
x11grab
zlib
@@ -1137,6 +1139,7 @@ HAVE_LIST="
CONFIG_EXTRA="
avutil
gplv3
+ gplv2
lgplv3
"
@@ -2558,7 +2561,11 @@ die_license_disabled version3 libopencore_amrwb
die_license_disabled version3 libvo_aacenc
die_license_disabled version3 libvo_amrwbenc
+! enabled gpl && enabled version2 && die "LGPLv2 mode is unsupported"
+enabled version3 && enabled version2 && ! enabled nonfree && die "GPLv2 (not
v2+) and GPLv3 without --enable-nonfree"
+
enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
+enabled version2 && enabled gpl && enable gplv2
disabled optimizations || check_cflags -fomit-frame-pointer
@@ -3183,6 +3190,8 @@ if enabled nonfree; then
license="nonfree and unredistributable"
elif enabled gplv3; then
license="GPL version 3 or later"
+elif enabled gplv2; then
+ license="GPL version 2"
elif enabled lgplv3; then
license="LGPL version 3 or later"
elif enabled gpl; then
--
1.7.3.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
