From b5ede5a12d4e796c3a5abf8df4c538dd775cf647 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 19 Feb 2010 21:36:03 +0000 Subject: [PATCH] - restore Changed files: php-pear.patch -> 1.4 --- php-pear.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 php-pear.patch diff --git a/php-pear.patch b/php-pear.patch new file mode 100644 index 0000000..f750f91 --- /dev/null +++ b/php-pear.patch @@ -0,0 +1,48 @@ +--- 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 +- 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 if test "$PHP_PCRE_REGEX" = "no"; then ++dnl pear_error_msg="$pear_error_msg ++dnl PEAR requires PCRE to be enabled. Add --with-pcre-regex to the configure line. (or --without-pear)" ++dnl 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 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 -- 2.44.0