- updated to 7.1.24

[packages/php.git] / php-pear.patch

diff --git a/php-pear.patch b/php-pear.patch
index 400359d4e47458f60ab22f71a7c7315f1ddc303c..f8f05a7ffd1927ff3dc1a30eeb7fabdc67093abe 100644 (file)
--- a/php-pear.patch
+++ b/php-pear.patch
@@ -1,6 +1,6 @@
 --- php-5.3.1/configure.in~    2010-02-19 23:26:13.000000000 +0200
 +++ php-5.3.1/configure.in     2010-02-19 23:27:58.273207305 +0200
-@@ -934,11 +934,6 @@
+@@ -1091,11 +1091,6 @@
    with_pear=no
  fi
  
@@ -10,25 +10,25 @@
 -fi
 -
  PHP_ARG_WITH(pear, [whether to install PEAR],
- [  --with-pear=DIR         Install PEAR in DIR [PREFIX/lib/php]
+ [  --with-pear=DIR         Install PEAR in DIR @<:@PREFIX/lib/php@:>@
    --without-pear          Do not install PEAR], DEFAULT, yes)
-@@ -1023,11 +1023,11 @@
+@@ -1105,11 +1100,11 @@
    dnl
    dnl PEAR dependancies
    dnl
 -  if test "$PHP_XML" = "no"; then
--    pear_error_msg="$pear_error_msg 
+-    pear_error_msg="$pear_error_msg
 -                    PEAR requires XML to be enabled.     Add --enable-xml to the configure line. (or --without-pear)"
 -  fi
 -
 +dnl  if test "$PHP_XML" = "no"; then
-+dnl    pear_error_msg="$pear_error_msg 
++dnl    pear_error_msg="$pear_error_msg
 +dnl                    PEAR requires XML to be enabled.     Add --enable-xml to the configure line. (or --without-pear)"
 +dnl  fi
 +dnl
  dnl
  dnl  if test "$PHP_XMLRPC" = "no"; then
- dnl    pear_error_msg="$pear_error_msg 
+ dnl    pear_error_msg="$pear_error_msg
 --- php-5.2.6/sapi/cli/config.m4~      2008-11-16 18:35:31.000000000 +0200
 +++ php-5.2.6/sapi/cli/config.m4       2008-11-20 19:04:12.585061299 +0200
 @@ -4,7 +4,7 @@