tony2001 Wed Nov 8 19:05:41 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/pear Makefile.frag
/php-src NEWS
Log:
fix #39300 (make install fails if wget is not available)
add support of 'fetch'
http://cvs.php.net/viewvc.cgi/php-src/pear/Makefile.frag?r1=1.35.6.10.2.1&r2=1.35.6.10.2.2&diff_format=u
Index: php-src/pear/Makefile.frag
diff -u php-src/pear/Makefile.frag:1.35.6.10.2.1
php-src/pear/Makefile.frag:1.35.6.10.2.2
--- php-src/pear/Makefile.frag:1.35.6.10.2.1 Sun May 7 16:32:40 2006
+++ php-src/pear/Makefile.frag Wed Nov 8 19:05:41 2006
@@ -4,6 +4,8 @@
# 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 @@
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 \
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.340&r2=1.2027.2.547.2.341&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.340 php-src/NEWS:1.2027.2.547.2.341
--- php-src/NEWS:1.2027.2.547.2.340 Wed Nov 8 13:38:28 2006
+++ php-src/NEWS Wed Nov 8 19:05:41 2006
@@ -30,6 +30,7 @@
an extension INI directive). (wharmby at uk dot ibm dot com, Dmitry)
- Fixed bug #39320 (ZEND_HASH_APPLY_STOP causes deletion). (Marcus)
- Fixed bug #39313 (spl_autoload triggers Fatal error). (Marcus)
+- Fixed bug #39300 (make install fails if wget is not available). (Tony)
- Fixed bug #39297 (Memory corryption because of indirect modification
of overloaded array). (Dmitry)
- Fixed bug #39265 (Fixed path handling inside mod_files.sh).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
