From 1f061b3154107d83ea06b9a165994589743ab0c8 Mon Sep 17 00:00:00 2001
From: Antony Dovgal <tony2001@php.net>
Date: Wed, 8 Nov 2006 19:05:41 +0000
Subject: fix #39300 (make install fails if wget is not available) add support
 of 'fetch'

---
 pear/Makefile.frag | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'pear')

diff --git a/pear/Makefile.frag b/pear/Makefile.frag
index eb8e289cb6..4a5456263d 100644
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
@@ -4,6 +4,8 @@ peardir=$(PEAR_INSTALLDIR)
 
 # Skip all php.ini files altogether
 PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0
+WGET = `which wget 2>/dev/null`
+FETCH = `which fetch 2>/dev/null`
 
 install-pear-installer: $(SAPI_CLI_PATH)
 	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
@@ -14,7 +16,15 @@ install-pear:
 		if test -f $(srcdir)/install-pear-nozlib.phar; then \
 			cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
 		else \
-			wget http://pear.php.net/install-pear-nozlib.phar -nd -P $(builddir)/;  \
+			if test ! -z "$(WGET)" && test -x "$(WGET)"; then \
+				"$(WGET)" http://pear.php.net/install-pear-nozlib.phar -nd -P $(builddir)/; \
+			elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
+				"$(FETCH)" -o $(builddir)/ http://pear.php.net/install-pear-nozlib.phar; \
+			else \
+				echo ""; \
+				echo "No download utilities found. Don't know how to download PEAR archive."; \
+				echo ""; \
+			fi \
 		fi \
 	fi
 	@if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
-- 
cgit v1.2.1