This commit was manufactured by cvs2git to create branch 'DEVEL'.

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

--- 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 @@
   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)
@@ -1023,11 +1023,11 @@
   dnl
   dnl PEAR dependancies
   dnl
-  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_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
 dnl  if test "$PHP_XMLRPC" = "no"; then
 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 @@
 
 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