SOURCES: php-no_pear_install.patch - remove pear deps and rules, j...

[glen]

Author: glen                         Date: Mon Oct 17 16:29:52 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- remove pear deps and rules, just leave in include_path modification

---- Files affected:
SOURCES:
   php-no_pear_install.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/php-no_pear_install.patch
diff -u SOURCES/php-no_pear_install.patch:1.3 SOURCES/php-no_pear_install.patch:1.4
--- SOURCES/php-no_pear_install.patch:1.3	Tue Jul 20 00:02:26 2004
+++ SOURCES/php-no_pear_install.patch	Mon Oct 17 18:29:47 2005
@@ -9,3 +9,30 @@
  
  case $PHP_SAPI in
    cgi)
+--- ./configure.in~	2005-10-17 19:09:07.000000000 +0300
++++ ./configure.in	2005-10-17 19:19:18.000000000 +0300
+@@ -937,15 +937,6 @@
+   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
+ dnl ext/xmlrpc is not really there yet to be a requirement..
+ dnl
+@@ -968,8 +959,6 @@
+       *)   PEAR_INSTALLDIR=$libdir/php;;
+     esac
+   fi
+-
+-  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
+ fi
+ 
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php-no_pear_install.patch?r1=1.3&r2=1.4&f=u