[vlc-commits] contribs: detect git, svn, wget/curl

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jun 25 00:02:27 2011 +0300| [e4e00a4e00d5b1f62d5a23da9f5a20799de9c405] | committer: Rémi Denis-Courmont

contribs: detect git, svn, wget/curl

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

 contrib/src/main.mak |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index e3e3f8a..779a3a1 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -99,8 +99,31 @@ endif
 PKG_CONFIG_PATH += :$(PREFIX)/lib/pkgconfig
 export PKG_CONFIG_PATH
 
-SVN ?= svn
-WGET ?= wget
+ifndef GIT
+ifeq ($(shell git --version >/dev/null 2>&1 || echo FAIL),)
+GIT = git
+endif
+endif
+GIT ?= $(error git not found!)
+
+ifndef SVN
+ifeq ($(shell svn --version >/dev/null 2>&1 || echo FAIL),)
+SVN = svn
+endif
+endif
+SVN ?= $(error subversion client (svn) not found!)
+
+ifndef WGET
+ifeq ($(shell wget --version >/dev/null 2>&1 || echo FAIL),)
+WGET = wget --passive -c
+endif
+endif
+ifndef WGET
+ifeq ($(shell curl --version >/dev/null 2>&1 || echo FAIL),)
+WGET = curl -L -O
+endif
+endif
+WGET ?= $(error Neither wget not curl found!)
 
 #
 # Common helpers