]>
Commit | Line | Data |
---|---|---|
d0e9fdf2 ER |
1 | --- php-5.2.0/configure.in 2006-11-03 01:46:52.697656608 +0200 |
2 | +++ php-5.2.6/configure.in 2008-11-20 19:11:27.231805230 +0200 | |
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 | @@ -955,14 +950,14 @@ | |
a551d588 ER |
16 | dnl |
17 | dnl PEAR dependancies | |
18 | dnl | |
19 | - if test "$PHP_PCRE_REGEX" = "no"; then | |
20 | - pear_error_msg="$pear_error_msg | |
21 | - PEAR requires PCRE to be enabled. Add --with-pcre-regex to the configure line. (or --without-pear)" | |
22 | - fi | |
23 | - if test "$PHP_XML" = "no"; then | |
24 | - pear_error_msg="$pear_error_msg | |
25 | - PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" | |
26 | - fi | |
27 | +dnl if test "$PHP_PCRE_REGEX" = "no"; then | |
28 | +dnl pear_error_msg="$pear_error_msg | |
29 | +dnl PEAR requires PCRE to be enabled. Add --with-pcre-regex to the configure line. (or --without-pear)" | |
30 | +dnl fi | |
31 | +dnl if test "$PHP_XML" = "no"; then | |
32 | +dnl pear_error_msg="$pear_error_msg | |
33 | +dnl PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" | |
34 | +dnl fi | |
35 | ||
36 | dnl | |
37 | dnl if test "$PHP_XMLRPC" = "no"; then | |
d0e9fdf2 ER |
38 | --- php-5.2.6/sapi/cli/config.m4~ 2008-11-16 18:35:31.000000000 +0200 |
39 | +++ php-5.2.6/sapi/cli/config.m4 2008-11-20 19:04:12.585061299 +0200 | |
40 | @@ -4,7 +4,7 @@ | |
41 | ||
42 | PHP_ARG_ENABLE(cli,, | |
43 | [ --disable-cli Disable building CLI version of PHP | |
44 | - (this forces --without-pear)], yes, no) | |
45 | + ], yes, no) | |
46 | ||
47 | AC_MSG_CHECKING(for CLI build) | |
48 | if test "$PHP_CLI" != "no"; then |