]> git.pld-linux.org Git - packages/php.git/blob - php-pear.patch
- first batch of rediffed patches
[packages/php.git] / php-pear.patch
1 diff -urNp -x '*.orig' php-7.2.34.org/configure.ac php-7.2.34/configure.ac
2 --- php-7.2.34.org/configure.ac 2021-08-24 01:07:28.613260961 +0200
3 +++ php-7.2.34/configure.ac     2021-08-24 01:07:29.806593323 +0200
4 @@ -1102,11 +1102,6 @@ if test -z "$with_pear" && test "$enable
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],
14  [  --with-pear=DIR         Install PEAR in DIR @<:@PREFIX/lib/php@:>@
15    --without-pear          Do not install PEAR], DEFAULT, yes)
16 @@ -1116,11 +1111,11 @@ if test "$PHP_PEAR" != "no"; then
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
33 diff -urNp -x '*.orig' php-7.2.34.org/sapi/cli/config.m4 php-7.2.34/sapi/cli/config.m4
34 --- php-7.2.34.org/sapi/cli/config.m4   2021-08-24 01:07:28.613260961 +0200
35 +++ php-7.2.34/sapi/cli/config.m4       2021-08-24 01:07:29.806593323 +0200
36 @@ -4,7 +4,7 @@ dnl
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  
43  AC_CHECK_FUNCS(setproctitle)
44  
This page took 0.026712 seconds and 3 git commands to generate.