- do not disable pear if cli is not enabled

Changed files:
    php-pear.patch -> 1.2

diff --git a/php-pear.patch b/php-pear.patch
index ca65238280f1e6998c6b36877839f43cbc314317..f750f919fea41c145c1e9daf708540047bf7c896 100644 (file)
--- a/php-pear.patch
+++ b/php-pear.patch
@@ -1,6 +1,18 @@
---- php-5.2.0/configure.in~    2006-11-03 01:38:33.246428054 +0200
-+++ php-5.2.0/configure.in     2006-11-03 01:46:52.697656608 +0200
-@@ -955,14 +955,14 @@
+--- 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
@@ -23,3 +35,14 @@
  
  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