add su directive for logrotate 3.8.0

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

diff --git a/php-no_pear_install.patch b/php-no_pear_install.patch
index dda57759559cbe65a76d9ac79ad53d534005d7a0..ac326e16431bb49fcdae366de64f8c584872c7cd 100644 (file)
--- a/php-no_pear_install.patch
+++ b/php-no_pear_install.patch
@@ -1,38 +1,12 @@
---- 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 @@
- CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
+diff -ur php5.3-200807242030/configure.in mod/configure.in
+--- php5.3-200807242030/configure.in   2008-07-21 10:34:20.000000000 +0000
++++ mod/configure.in   2008-07-25 07:34:45.430571275 +0000
+@@ -1385,7 +1385,7 @@
+ fi;
  
- all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
--install_targets="$install_modules $install_pear install-build install-headers install-programs"
-+install_targets="$install_modules install-build install-headers install-programs"
+ all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd"
+-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
++install_targets="$install_modules install-build install-headers install-programs $pharcmd_install"
  
  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
- 
- 
+   cli)