Index: pear/Makefile.frag
===================================================================
RCS file: /repository/php-src/pear/Attic/Makefile.frag,v
retrieving revision 1.35.6.10.2.1
diff -u -p -d -r1.35.6.10.2.1 Makefile.frag
--- pear/Makefile.frag	7 May 2006 16:32:40 -0000	1.35.6.10.2.1
+++ pear/Makefile.frag	8 Nov 2006 18:50:36 -0000
@@ -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 \