contrib: add bootstrap options for sout and optical discs support

contrib/bootstrap

@@ -26,6 +26,8 @@ usage()
 	echo "  --prefix=PREFIX  install files in PREFIX"
 	echo "  --disable-FOO    configure to not build package FOO"
 	echo "  --enable-FOO     configure to build package FOO"
+	echo "  --disable-disc   configure to not build optical discs packages"
+	echo "  --disable-sout   configure to not build stream output packages"
 }
 
 BUILD=
@@ -33,6 +35,8 @@ HOST=
 PREFIX=
 PKGS_ENABLE=
 PKGS_DISABLE=
+BUILD_ENCODERS="1"
+BUILD_DISCS="1"
 
 if test ! -f "../src/main.mak"
 then
@@ -56,6 +60,12 @@ do
 		--prefix=*)
 			PREFIX="${1#--prefix=}"
 			;;
+		--disable-disc)
+			BUILD_DISCS=
+			;;
+		--disable-sout)
+			BUILD_ENCODERS=
+			;;
 		--disable-*)
 			PKGS_DISABLE="${PKGS_DISABLE} ${1#--disable-}"
 			;;
@@ -134,6 +144,9 @@ add_make_enabled()
 	done
 }
 
+test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
+test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
+
 #
 # Checks
 #
@@ -158,7 +171,6 @@ case "${OS}" in
 		add_make_enabled "HAVE_WINCE"
 		;;
 esac
-add_make_enabled "BUILD_ENCODERS"
 
 #
 # Results output