]>
Commit | Line | Data |
---|---|---|
791b59e4 JR |
1 | diff -urNp -x '*.orig' php-5.6.40.org/configure.in php-5.6.40/configure.in |
2 | --- php-5.6.40.org/configure.in 2021-08-23 23:19:20.735798578 +0200 | |
3 | +++ php-5.6.40/configure.in 2021-08-23 23:19:21.769130837 +0200 | |
4 | @@ -1078,11 +1078,6 @@ if test -z "$with_pear" && test "$enable | |
c0240cb1 | 5 | with_pear=no |
6 | fi | |
7 | ||
8 | -# If CLI is disabled -> disable PEAR | |
9 | -if test "$PHP_CLI" = "no"; then | |
10 | - with_pear=no | |
11 | -fi | |
12 | - | |
13 | PHP_ARG_WITH(pear, [whether to install PEAR], | |
791b59e4 | 14 | [ --with-pear=DIR Install PEAR in DIR @<:@PREFIX/lib/php@:>@ |
c0240cb1 | 15 | --without-pear Do not install PEAR], DEFAULT, yes) |
791b59e4 | 16 | @@ -1092,11 +1087,11 @@ if test "$PHP_PEAR" != "no"; then |
c0240cb1 | 17 | dnl |
18 | dnl PEAR dependancies | |
19 | dnl | |
20 | - if test "$PHP_XML" = "no"; then | |
21 | - pear_error_msg="$pear_error_msg | |
22 | - PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" | |
23 | - fi | |
24 | - | |
25 | +dnl if test "$PHP_XML" = "no"; then | |
26 | +dnl pear_error_msg="$pear_error_msg | |
27 | +dnl PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" | |
28 | +dnl fi | |
29 | +dnl | |
30 | dnl | |
31 | dnl if test "$PHP_XMLRPC" = "no"; then | |
32 | dnl pear_error_msg="$pear_error_msg | |
791b59e4 JR |
33 | diff -urNp -x '*.orig' php-5.6.40.org/sapi/cli/config.m4 php-5.6.40/sapi/cli/config.m4 |
34 | --- php-5.6.40.org/sapi/cli/config.m4 2021-08-23 23:19:20.735798578 +0200 | |
35 | +++ php-5.6.40/sapi/cli/config.m4 2021-08-23 23:19:21.769130837 +0200 | |
36 | @@ -4,7 +4,7 @@ dnl | |
c0240cb1 | 37 | |
38 | PHP_ARG_ENABLE(cli,, | |
39 | [ --disable-cli Disable building CLI version of PHP | |
40 | - (this forces --without-pear)], yes, no) | |
41 | + ], yes, no) | |
42 | ||
791b59e4 JR |
43 | AC_CHECK_FUNCS(setproctitle) |
44 |