[vlc-commits] contrib: add --disable-net to disable network related code

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Jul 22 17:48:18 2013 +0200| [7eecb5b77b561c35878f4351b29a508ea76fc1a0] | committer: Rafaël Carré

contrib: add --disable-net to disable network related code

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

 contrib/bootstrap               |    6 ++++++
 contrib/src/cddb/rules.mak      |    2 ++
 contrib/src/ffmpeg/rules.mak    |    3 +++
 contrib/src/gnutls/rules.mak    |    2 ++
 contrib/src/live555/rules.mak   |    2 ++
 contrib/src/shout/rules.mak     |    2 ++
 contrib/src/upnp/rules.mak      |    2 ++
 contrib/src/vncserver/rules.mak |    2 ++
 8 files changed, 21 insertions(+)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 6bf7bd5..5246200 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -27,6 +27,7 @@ usage()
 	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-net    configure to not build networking packages"
 	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"
@@ -38,6 +39,7 @@ PREFIX=
 PKGS_ENABLE=
 PKGS_DISABLE=
 BUILD_ENCODERS="1"
+BUILD_NETWORK="1"
 BUILD_DISCS="1"
 GPL="1"
 
@@ -66,6 +68,9 @@ do
 		--disable-disc)
 			BUILD_DISCS=
 			;;
+		--disable-net)
+			BUILD_NETWORK=
+			;;
 		--disable-sout)
 			BUILD_ENCODERS=
 			;;
@@ -204,6 +209,7 @@ check_android_sdk()
 test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
 test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
 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"
 
diff --git a/contrib/src/cddb/rules.mak b/contrib/src/cddb/rules.mak
index 6370d85..1adaf89 100644
--- a/contrib/src/cddb/rules.mak
+++ b/contrib/src/cddb/rules.mak
@@ -2,9 +2,11 @@
 CDDB_VERSION := 1.3.2
 CDDB_URL := $(SF)/libcddb/libcddb-$(CDDB_VERSION).tar.bz2
 
+ifdef BUILD_NETWORK
 ifdef BUILD_DISCS
 PKGS += cddb
 endif
+endif
 ifeq ($(call need_pkg,"libcddb"),)
 PKGS_FOUND += cddb
 endif
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 31ef69a..e9899b6 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -27,6 +27,9 @@ FFMPEGCONF = \
 DEPS_ffmpeg = zlib gsm openjpeg
 
 # Optional dependencies
+ifndef BUILD_NETWORK
+FFMPEGCONF += --disable-network
+endif
 ifdef BUILD_ENCODERS
 FFMPEGCONF += --enable-libmp3lame --enable-libvpx --disable-decoder=libvpx --disable-decoder=libvpx_vp8 --disable-decoder=libvpx_vp9
 DEPS_ffmpeg += lame $(DEPS_lame) vpx $(DEPS_vpx)
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 55e235f..7c2c962 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -3,7 +3,9 @@
 GNUTLS_VERSION := 3.1.12
 GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-$(GNUTLS_VERSION).tar.xz
 
+ifdef BUILD_NETWORK
 PKGS += gnutls
+endif
 ifeq ($(call need_pkg,"gnutls >= 3.0.20"),)
 PKGS_FOUND += gnutls
 endif
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 840f808..9e94cca 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -4,7 +4,9 @@
 LIVE555_FILE := live.2012.12.18.tar.gz
 LIVEDOTCOM_URL := http://download.videolan.org/pub/contrib/live555/$(LIVE555_FILE)
 
+ifdef BUILD_NETWORK
 PKGS += live555
+endif
 
 $(TARBALLS)/$(LIVE555_FILE):
 	$(call download,$(LIVEDOTCOM_URL))
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index dcffaa7..5dcbedc 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -4,8 +4,10 @@ SHOUT_VERSION := 2.3.1
 SHOUT_URL := http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
 
 ifdef BUILD_ENCODERS
+ifdef BUILD_NETWORK
 PKGS += shout
 endif
+endif
 ifeq ($(call need_pkg,"shout >= 2.1"),)
 PKGS_FOUND += shout
 endif
diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index 7fa2359..b283032 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -2,7 +2,9 @@
 UPNP_VERSION := 1.6.18
 UPNP_URL := $(SF)/pupnp/libupnp-$(UPNP_VERSION).tar.bz2
 
+ifdef BUILD_NETWORK
 PKGS += upnp
+endif
 
 $(TARBALLS)/libupnp-$(UPNP_VERSION).tar.bz2:
 	$(call download,$(UPNP_URL))
diff --git a/contrib/src/vncserver/rules.mak b/contrib/src/vncserver/rules.mak
index 1a7c47f..e4991b0 100644
--- a/contrib/src/vncserver/rules.mak
+++ b/contrib/src/vncserver/rules.mak
@@ -3,7 +3,9 @@
 VNCSERVER_VERSION := 0.9.9
 VNCSERVER_URL := $(SF)/libvncserver/libvncserver/$(VNCSERVER_VERSION)/LibVNCServer-$(VNCSERVER_VERSION).tar.gz
 
+ifdef BUILD_NETWORK
 PKGS += vncserver
+endif
 ifeq ($(call need_pkg,"libvncclient"),)
 PKGS_FOUND += vncserver
 endif