]>
Commit | Line | Data |
---|---|---|
848c281a ER |
1 | --- php-7.3.0beta3/configure.ac~ 2018-09-05 19:02:49.000000000 +0300 |
2 | +++ php-7.3.0beta3/configure.ac 2018-09-05 19:04:13.237533903 +0300 | |
c0240cb1 | 3 | @@ -934,11 +934,6 @@ |
4 | with_pear=no | |
5 | fi | |
6 | ||
7 | -# If CLI is disabled -> disable PEAR | |
8 | -if test "$PHP_CLI" = "no"; then | |
9 | - with_pear=no | |
10 | -fi | |
11 | - | |
12 | PHP_ARG_WITH(pear, [whether to install PEAR], | |
13 | [ --with-pear=DIR Install PEAR in DIR [PREFIX/lib/php] | |
14 | --without-pear Do not install PEAR], DEFAULT, yes) | |
848c281a ER |
15 | @@ -1137,19 +1137,6 @@ |
16 | --without-pear Do not install PEAR], DEFAULT, yes) | |
17 | ||
18 | if test "$PHP_PEAR" != "no"; then | |
19 | - | |
20 | - dnl | |
21 | - dnl PEAR dependencies | |
22 | - dnl | |
c0240cb1 | 23 | - if test "$PHP_XML" = "no"; then |
848c281a | 24 | - pear_error_msg="$pear_error_msg |
c0240cb1 | 25 | - PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" |
26 | - fi | |
27 | - | |
848c281a ER |
28 | - if test "$pear_error_msg"; then |
29 | - AC_MSG_ERROR([$pear_error_msg]) | |
30 | - fi | |
31 | - | |
32 | install_pear="install-pear" | |
33 | PEAR_INSTALLDIR=$PHP_PEAR | |
34 | ||
c0240cb1 | 35 | --- php-5.2.6/sapi/cli/config.m4~ 2008-11-16 18:35:31.000000000 +0200 |
36 | +++ php-5.2.6/sapi/cli/config.m4 2008-11-20 19:04:12.585061299 +0200 | |
37 | @@ -4,7 +4,7 @@ | |
38 | ||
39 | PHP_ARG_ENABLE(cli,, | |
40 | [ --disable-cli Disable building CLI version of PHP | |
41 | - (this forces --without-pear)], yes, no) | |
42 | + ], yes, no) | |
43 | ||
44 | AC_MSG_CHECKING(for CLI build) | |
45 | if test "$PHP_CLI" != "no"; then |