- release 10

[packages/php4.git] / php4-no_pear_install.patch

diff --git a/php4-no_pear_install.patch b/php4-no_pear_install.patch
index 1250a3752fb9cd2402ace9a1575a3b399ab991db..ac89b0d0aa9db05e4c8b05e11a77e6d50b7cd343 100644 (file)
--- a/php4-no_pear_install.patch
+++ b/php4-no_pear_install.patch
@@ -1,6 +1,7 @@
---- php-5.0.0b3.orig/configure.in      2003-12-24 17:30:44.000000000 +0100
-+++ php-5.0.0b3/configure.in   2003-12-24 17:31:45.000000000 +0100
-@@ -1149,7 +1149,7 @@
+diff -burN php-4.3.5RC1.orig/configure.in php-4.3.5RC1/configure.in
+--- php-4.3.5RC1.orig/configure.in     2004-02-05 10:28:06.283736312 +0100
++++ php-4.3.5RC1/configure.in  2004-02-05 10:31:29.388859640 +0100
+@@ -1138,7 +1138,7 @@
  CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
  
  all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
@@ -9,3 +10,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
+ 
+