packages: php/php-pear.patch - restore

[glen]

Author: glen                         Date: Fri Feb 19 21:36:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- restore

---- Files affected:
packages/php:
   php-pear.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/php/php-pear.patch
diff -u /dev/null packages/php/php-pear.patch:1.4
--- /dev/null	Fri Feb 19 22:36:08 2010
+++ packages/php/php-pear.patch	Fri Feb 19 22:36:03 2010
@@ -0,0 +1,48 @@
+--- php-5.2.0/configure.in	2006-11-03 01:46:52.697656608 +0200
++++ php-5.2.6/configure.in	2008-11-20 19:11:27.231805230 +0200
+@@ -934,11 +934,6 @@
+   with_pear=no
+ fi
+ 
+-# If CLI is disabled -> disable PEAR
+-if test "$PHP_CLI" = "no"; then
+-  with_pear=no
+-fi
+-
+ PHP_ARG_WITH(pear, [whether to install PEAR],
+ [  --with-pear=DIR         Install PEAR in DIR [PREFIX/lib/php]
+   --without-pear          Do not install PEAR], DEFAULT, yes)
+@@ -955,14 +950,14 @@
+   dnl
+   dnl PEAR dependancies
+   dnl
+-  if test "$PHP_PCRE_REGEX" = "no"; then
+-    pear_error_msg="$pear_error_msg 
+-                    PEAR requires PCRE to be enabled.    Add --with-pcre-regex to the configure line. (or --without-pear)"
+-  fi
+-  if test "$PHP_XML" = "no"; then
+-    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_PCRE_REGEX" = "no"; then
++dnl    pear_error_msg="$pear_error_msg 
++dnl                    PEAR requires PCRE to be enabled.    Add --with-pcre-regex to the configure line. (or --without-pear)"
++dnl  fi
++dnl  if test "$PHP_XML" = "no"; then
++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  if test "$PHP_XMLRPC" = "no"; then
+--- 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 @@
+ 
+ PHP_ARG_ENABLE(cli,,
+ [  --disable-cli           Disable building CLI version of PHP
+-                          (this forces --without-pear)], yes, no)
++                          ], yes, no)
+ 
+ AC_MSG_CHECKING(for CLI build)
+ if test "$PHP_CLI" != "no"; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-pear.patch?r1=1.3&r2=1.4&f=u