]>
Commit | Line | Data |
---|---|---|
5c8bd0f5 ER |
1 | --- php-5.3.1/configure.ac~ 2010-02-19 23:26:13.000000000 +0200 |
2 | +++ php-5.3.1/configure.ac 2010-02-19 23:27:58.273207305 +0200 | |
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) | |
15 | @@ -1023,11 +1023,11 @@ | |
16 | dnl | |
17 | dnl PEAR dependancies | |
18 | dnl | |
19 | - if test "$PHP_XML" = "no"; then | |
20 | - pear_error_msg="$pear_error_msg | |
21 | - PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" | |
22 | - fi | |
23 | - | |
24 | +dnl if test "$PHP_XML" = "no"; then | |
25 | +dnl pear_error_msg="$pear_error_msg | |
26 | +dnl PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" | |
27 | +dnl fi | |
28 | +dnl | |
29 | dnl | |
30 | dnl if test "$PHP_XMLRPC" = "no"; then | |
31 | dnl pear_error_msg="$pear_error_msg | |
32 | --- php-5.2.6/sapi/cli/config.m4~ 2008-11-16 18:35:31.000000000 +0200 | |
33 | +++ php-5.2.6/sapi/cli/config.m4 2008-11-20 19:04:12.585061299 +0200 | |
34 | @@ -4,7 +4,7 @@ | |
35 | ||
36 | PHP_ARG_ENABLE(cli,, | |
37 | [ --disable-cli Disable building CLI version of PHP | |
38 | - (this forces --without-pear)], yes, no) | |
39 | + ], yes, no) | |
40 | ||
41 | AC_MSG_CHECKING(for CLI build) | |
42 | if test "$PHP_CLI" != "no"; then |