File tree 2 files changed +12
-1
lines changed
2 files changed +12
-1
lines changed Original file line number Diff line number Diff line change @@ -30,6 +30,7 @@ PHP NEWS
30
30
an extension INI directive). (wharmby at uk dot ibm dot com, Dmitry)
31
31
- Fixed bug #39320 (ZEND_HASH_APPLY_STOP causes deletion). (Marcus)
32
32
- Fixed bug #39313 (spl_autoload triggers Fatal error). (Marcus)
33
+ - Fixed bug #39300 (make install fails if wget is not available). (Tony)
33
34
- Fixed bug #39297 (Memory corryption because of indirect modification
34
35
of overloaded array). (Dmitry)
35
36
- Fixed bug #39265 (Fixed path handling inside mod_files.sh).
Original file line number Diff line number Diff line change @@ -4,6 +4,8 @@ peardir=$(PEAR_INSTALLDIR)
4
4
5
5
# Skip all php.ini files altogether
6
6
PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0
7
+ WGET = ` which wget 2> /dev/null `
8
+ FETCH = ` which fetch 2> /dev/null `
7
9
8
10
install-pear-installer : $(SAPI_CLI_PATH )
9
11
@$(top_builddir ) /sapi/cli/php $(PEAR_INSTALL_FLAGS ) $(builddir ) /install-pear-nozlib.phar -d " $( peardir) " -b " $( bindir) "
@@ -14,7 +16,15 @@ install-pear:
14
16
if test -f $( srcdir) /install-pear-nozlib.phar; then \
15
17
cp $(srcdir ) /install-pear-nozlib.phar $(builddir ) /install-pear-nozlib.phar; \
16
18
else \
17
- wget http://pear.php.net/install-pear-nozlib.phar -nd -P $(builddir ) /; \
19
+ if test ! -z " $( WGET) " && test -x " $( WGET) " ; then \
20
+ " $( WGET) " http://pear.php.net/install-pear-nozlib.phar -nd -P $(builddir ) /; \
21
+ elif test ! -z " $( FETCH) " && test -x " $( FETCH) " ; then \
22
+ " $( FETCH) " -o $(builddir ) / http://pear.php.net/install-pear-nozlib.phar; \
23
+ else \
24
+ echo " " ; \
25
+ echo " No download utilities found. Don't know how to download PEAR archive." ; \
26
+ echo " " ; \
27
+ fi \
18
28
fi \
19
29
fi
20
30
@if test -f $(builddir ) /install-pear-nozlib.phar && $(mkinstalldirs ) $(INSTALL_ROOT )$(peardir ) ; then \
You can’t perform that action at this time.
0 commit comments