[vlc-commits] contrib: add option to turn off (L)GPL version 3

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Sep 25 19:30:20 2017 +0300| [7807d25f1620111b592b56de7bf6e40c00cdd76b] | committer: Rémi Denis-Courmont

contrib: add option to turn off (L)GPL version 3

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7807d25f1620111b592b56de7bf6e40c00cdd76b
---

 contrib/bootstrap    | 6 ++++++
 contrib/src/main.mak | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 218487e2ab..773893855c 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -31,6 +31,7 @@ usage()
 	echo "  --disable-sout   configure to not build stream output packages"
 	echo "  --enable-small   optimize libraries for size with slight speed decrease [DANGEROUS]"
 	echo "  --disable-gpl    configure to not build viral GPL code"
+	echo "  --disable-gnuv3  configure to not build version 3 (L)GPL code"
 	echo "  --disable-optim  disable optimization in libraries"
 }
 
@@ -43,6 +44,7 @@ BUILD_ENCODERS="1"
 BUILD_NETWORK="1"
 BUILD_DISCS="1"
 GPL="1"
+GNUV3="1"
 WITH_OPTIMIZATION="1"
 
 if test ! -f "../../contrib/src/main.mak"
@@ -85,6 +87,9 @@ do
 		--disable-gpl)
 			GPL=
 			;;
+		--disable-gnuv3)
+			GNUV3=
+			;;
 		--disable-*)
 			PKGS_DISABLE="${PKGS_DISABLE} ${1#--disable-}"
 			;;
@@ -246,6 +251,7 @@ test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
 test -z "$BUILD_NETWORK" || add_make_enabled "BUILD_NETWORK"
 test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
 test -z "$GPL" || add_make_enabled "GPL"
+test -z "$GNUV3" || add_make_enabled "GNUV3"
 test -z "$WITH_OPTIMIZATION" || add_make_enabled "WITH_OPTIMIZATION"
 test "`uname -o`" != "Msys" || add_make "CMAKE_GENERATOR := -G \"MSYS Makefiles\""
 
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 1d9b6226ea..ba97ba329b 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -358,6 +358,13 @@ REQUIRE_GPL =
 else
 REQUIRE_GPL = @echo "Package \"$<\" requires the GPL license." >&2; exit 1
 endif
+ifdef GNUV3
+REQUIRE_GNUV3 =
+else
+REQUIRE_GNUV3 = \
+	@echo "Package \"$<\" requires the version 3 of GNU licenses." >&2; \
+	exit 1
+endif
 
 #
 # Per-package build rules