[vlc-commits] contrib/tools: use BSD fetch if curl/wget are absent

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Jan 27 06:41:54 2012 -0500| [12bc6ed40da1d6ddc2bf5c111e503fbae8137f0f] | committer: Rafaël Carré

contrib/tools: use BSD fetch if curl/wget are absent

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

 contrib/src/main.mak   |    5 +++++
 extras/tools/tools.mak |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index b810887..81e6112 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -184,6 +184,11 @@ download = rm -f $@.tmp && \
 	wget --passive -c -p -O $@.tmp "$(1)" && \
 	touch $@.tmp && \
 	mv $@.tmp $@
+else ifeq ($(which fetch >/dev/null 2>&1 || echo FAIL),)
+download = rm -f $@.tmp && \
+	fetch -p -o $@.tmp "$(1)" && \
+	touch $@.tmp && \
+	mv $@.tmp $@
 else
 download = $(error Neither curl nor wget found!)
 endif
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 95ca38d..46b9da0 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -18,6 +18,11 @@ download = rm -f $@.tmp && \
 	wget --passive -c -p -O $@.tmp "$(1)" && \
 	touch $@.tmp && \
 	mv $@.tmp $@
+else ifeq ($(which fetch >/dev/null 2>&1 || echo FAIL),)
+download = rm -f $@.tmp && \
+	fetch -p -o $@.tmp "$(1)" && \
+	touch $@.tmp && \
+	mv $@.tmp $@
 else
 download = $(error Neither curl nor wget found!)
 endif